/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_xemacs.idb / usr / freeware / lib / xemacs-20.4 / lisp / ediff / ediff-util.elc.z / ediff-util.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar  9 12|
|00000040| 3a 34 38 3a 32 39 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:29 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 75 74 69 6c 2e 65 6c 0a |f/ediff-|util.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 |    (err|or "`edi|
|000001f0| 66 66 2d 75 74 69 6c 2e | 65 6c 27 20 77 61 73 20 |ff-util.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 0b 42 13 c4 0b |code "..|!...B...|
|00000270| 42 13 c5 0b 42 13 c6 0b | 42 13 c7 0b 42 13 c8 0b |B...B...|B...B...|
|00000280| 42 13 c9 0b 42 13 ca 0b | 42 13 cb cc 21 88 cb cd |B...B...|B...!...|
|00000290| 21 88 cb ce 21 88 cb cf | 21 88 cb d0 21 88 cb d1 |!...!...|!...!...|
|000002a0| 21 88 0e 12 ab 87 d3 d4 | d5 8f 88 aa 84 d6 d7 4d |!.......|.......M|
|000002b0| 88 d3 87 22 20 5b 70 72 | 6f 76 69 64 65 20 65 64 |..." [pr|ovide ed|
|000002c0| 69 66 66 2d 75 74 69 6c | 20 65 64 69 66 66 2d 70 |iff-util| ediff-p|
|000002d0| 61 74 63 68 2d 64 69 61 | 67 6e 6f 73 74 69 63 73 |atch-dia|gnostics|
|000002e0| 20 63 75 72 72 65 6e 74 | 2d 6c 6f 61 64 2d 6c 69 | current|-load-li|
|000002f0| 73 74 20 65 64 69 66 66 | 2d 70 61 74 63 68 62 75 |st ediff|-patchbu|
|00000300| 66 65 72 20 65 64 69 66 | 66 2d 74 6f 6f 6c 62 61 |fer edif|f-toolba|
|00000310| 72 20 65 64 69 66 66 2d | 74 6f 6f 6c 62 61 72 2d |r ediff-|toolbar-|
|00000320| 33 77 61 79 20 62 6f 74 | 74 6f 6d 2d 74 6f 6f 6c |3way bot|tom-tool|
|00000330| 62 61 72 20 62 6f 74 74 | 6f 6d 2d 74 6f 6f 6c 62 |bar bott|om-toolb|
|00000340| 61 72 2d 76 69 73 69 62 | 6c 65 2d 70 20 62 6f 74 |ar-visib|le-p bot|
|00000350| 74 6f 6d 2d 74 6f 6f 6c | 62 61 72 2d 68 65 69 67 |tom-tool|bar-heig|
|00000360| 68 74 20 6d 61 72 6b 2d | 61 63 74 69 76 65 20 72 |ht mark-|active r|
|00000370| 65 71 75 69 72 65 20 65 | 64 69 66 66 2d 69 6e 69 |equire e|diff-ini|
|00000380| 74 20 65 64 69 66 66 2d | 68 65 6c 70 20 65 64 69 |t ediff-|help edi|
|00000390| 66 66 2d 6d 75 6c 74 20 | 65 64 69 66 66 2d 77 69 |ff-mult |ediff-wi|
|000003a0| 6e 64 20 65 64 69 66 66 | 2d 64 69 66 66 20 65 64 |nd ediff|-diff ed|
|000003b0| 69 66 66 2d 6d 65 72 67 | 20 65 64 69 66 66 2d 78 |iff-merg| ediff-x|
|000003c0| 65 6d 61 63 73 2d 70 20 | 6e 69 6c 20 28 62 79 74 |emacs-p |nil (byt|
|000003d0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 87 22 20 5b 72 |e-code "|..!." [r|
|000003e0| 65 71 75 69 72 65 20 65 | 64 69 66 66 2d 74 62 61 |equire e|diff-tba|
|000003f0| 72 5d 20 32 29 20 28 28 | 65 72 72 6f 72 20 28 62 |r] 2) ((|error (b|
|00000400| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 4d 87 22 20 |yte-code| "..M." |
|00000410| 5b 65 64 69 66 66 2d 75 | 73 65 2d 74 6f 6f 6c 62 |[ediff-u|se-toolb|
|00000420| 61 72 2d 70 20 23 5b 6e | 69 6c 20 22 c0 87 22 20 |ar-p #[n|il ".." |
|00000430| 5b 6e 69 6c 5d 20 31 5d | 5d 20 32 29 29 29 20 65 |[nil] 1]|] 2))) e|
|00000440| 64 69 66 66 2d 75 73 65 | 2d 74 6f 6f 6c 62 61 72 |diff-use|-toolbar|
|00000450| 2d 70 20 23 5b 6e 69 6c | 20 22 c0 87 22 20 5b 6e |-p #[nil| ".." [n|
|00000460| 69 6c 5d 20 31 5d 5d 20 | 33 29 0a 23 40 36 36 38 |il] 1]] |3).#@668|
|00000470| 20 45 64 69 66 66 20 6d | 6f 64 65 20 63 6f 6e 74 | Ediff m|ode cont|
|00000480| 72 6f 6c 73 20 61 6c 6c | 20 6f 70 65 72 61 74 69 |rols all| operati|
|00000490| 6f 6e 73 20 69 6e 20 61 | 20 73 69 6e 67 6c 65 20 |ons in a| single |
|000004a0| 45 64 69 66 66 20 73 65 | 73 73 69 6f 6e 2e 0a 54 |Ediff se|ssion..T|
|000004b0| 68 69 73 20 6d 6f 64 65 | 20 69 73 20 65 6e 74 65 |his mode| is ente|
|000004c0| 72 65 64 20 74 68 72 6f | 75 67 68 20 6f 6e 65 20 |red thro|ugh one |
|000004d0| 6f 66 20 74 68 65 20 66 | 6f 6c 6c 6f 77 69 6e 67 |of the f|ollowing|
|000004e0| 20 63 6f 6d 6d 61 6e 64 | 73 3a 0a 09 60 65 64 69 | command|s:..`edi|
|000004f0| 66 66 27 0a 09 60 65 64 | 69 66 66 2d 66 69 6c 65 |ff'..`ed|iff-file|
|00000500| 73 27 0a 09 60 65 64 69 | 66 66 2d 62 75 66 66 65 |s'..`edi|ff-buffe|
|00000510| 72 73 27 0a 09 60 65 62 | 75 66 66 65 72 73 27 0a |rs'..`eb|uffers'.|
|00000520| 09 60 65 64 69 66 66 33 | 27 0a 09 60 65 64 69 66 |.`ediff3|'..`edif|
|00000530| 66 2d 66 69 6c 65 73 33 | 27 0a 09 60 65 64 69 66 |f-files3|'..`edif|
|00000540| 66 2d 62 75 66 66 65 72 | 73 33 27 0a 09 60 65 62 |f-buffer|s3'..`eb|
|00000550| 75 66 66 65 72 73 33 27 | 0a 09 60 65 64 69 66 66 |uffers3'|..`ediff|
|00000560| 2d 6d 65 72 67 65 27 0a | 09 60 65 64 69 66 66 2d |-merge'.|.`ediff-|
|00000570| 6d 65 72 67 65 2d 66 69 | 6c 65 73 27 0a 09 60 65 |merge-fi|les'..`e|
|00000580| 64 69 66 66 2d 6d 65 72 | 67 65 2d 66 69 6c 65 73 |diff-mer|ge-files|
|00000590| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 27 0a |-with-an|cestor'.|
|000005a0| 09 60 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |.`ediff-|merge-bu|
|000005b0| 66 66 65 72 73 27 0a 09 | 60 65 64 69 66 66 2d 6d |ffers'..|`ediff-m|
|000005c0| 65 72 67 65 2d 62 75 66 | 66 65 72 73 2d 77 69 74 |erge-buf|fers-wit|
|000005d0| 68 2d 61 6e 63 65 73 74 | 6f 72 27 0a 09 60 65 64 |h-ancest|or'..`ed|
|000005e0| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|000005f0| 6f 6e 73 27 0a 09 60 65 | 64 69 66 66 2d 6d 65 72 |ons'..`e|diff-mer|
|00000600| 67 65 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ge-revis|ions-wit|
|00000610| 68 2d 61 6e 63 65 73 74 | 6f 72 27 0a 09 60 65 64 |h-ancest|or'..`ed|
|00000620| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 77 6f 72 64 |iff-wind|ows-word|
|00000630| 77 69 73 65 27 0a 09 60 | 65 64 69 66 66 2d 77 69 |wise'..`|ediff-wi|
|00000640| 6e 64 6f 77 73 2d 6c 69 | 6e 65 77 69 73 65 27 0a |ndows-li|newise'.|
|00000650| 09 60 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d |.`ediff-|regions-|
|00000660| 77 6f 72 64 77 69 73 65 | 27 0a 09 60 65 64 69 66 |wordwise|'..`edif|
|00000670| 66 2d 72 65 67 69 6f 6e | 73 2d 6c 69 6e 65 77 69 |f-region|s-linewi|
|00000680| 73 65 27 0a 09 60 65 70 | 61 74 63 68 27 0a 09 60 |se'..`ep|atch'..`|
|00000690| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 66 69 6c 65 |ediff-pa|tch-file|
|000006a0| 27 0a 09 60 65 64 69 66 | 66 2d 70 61 74 63 68 2d |'..`edif|f-patch-|
|000006b0| 62 75 66 66 65 72 27 0a | 09 60 65 70 61 74 63 68 |buffer'.|.`epatch|
|000006c0| 2d 62 75 66 66 65 72 27 | 0a 20 20 20 20 20 20 20 |-buffer'|.       |
|000006d0| 20 60 65 72 65 76 69 73 | 69 6f 6e 27 0a 09 60 65 | `erevis|ion'..`e|
|000006e0| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 27 0a 0a |diff-rev|ision'..|
|000006f0| 43 6f 6d 6d 61 6e 64 73 | 3a 0a 5c 7b 65 64 69 66 |Commands|:.\{edif|
|00000700| 66 2d 6d 6f 64 65 2d 6d | 61 70 7d 1f 0a 28 64 65 |f-mode-m|ap}..(de|
|00000710| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6d 6f |falias '|ediff-mo|
|00000720| 64 65 20 23 5b 6e 69 6c | 20 22 c0 20 88 c1 12 c3 |de #[nil| ". ....|
|00000730| 14 c5 c6 21 87 22 20 5b | 6b 69 6c 6c 2d 61 6c 6c |...!." [|kill-all|
|00000740| 2d 6c 6f 63 61 6c 2d 76 | 61 72 69 61 62 6c 65 73 |-local-v|ariables|
|00000750| 20 65 64 69 66 66 2d 6d | 6f 64 65 20 6d 61 6a 6f | ediff-m|ode majo|
|00000760| 72 2d 6d 6f 64 65 20 22 | 45 64 69 66 66 22 20 6d |r-mode "|Ediff" m|
|00000770| 6f 64 65 2d 6e 61 6d 65 | 20 72 75 6e 2d 68 6f 6f |ode-name| run-hoo|
|00000780| 6b 73 20 65 64 69 66 66 | 2d 6d 6f 64 65 2d 68 6f |ks ediff|-mode-ho|
|00000790| 6f 6b 5d 20 32 20 28 23 | 24 20 2e 20 31 31 33 37 |ok] 2 (#|$ . 1137|
|000007a0| 29 5d 29 0a 23 40 31 32 | 35 20 4c 6f 63 61 6c 20 |)]).#@12|5 Local |
|000007b0| 6b 65 79 6d 61 70 20 75 | 73 65 64 20 69 6e 20 45 |keymap u|sed in E|
|000007c0| 64 69 66 66 20 6d 6f 64 | 65 2e 0a 54 68 69 73 20 |diff mod|e..This |
|000007d0| 69 73 20 6c 6f 63 61 6c | 20 74 6f 20 65 61 63 68 |is local| to each|
|000007e0| 20 45 64 69 66 66 20 43 | 6f 6e 74 72 6f 6c 20 50 | Ediff C|ontrol P|
|000007f0| 61 6e 65 6c 2c 20 73 6f | 20 74 68 65 79 20 6d 61 |anel, so| they ma|
|00000800| 79 20 76 61 72 79 20 66 | 72 6f 6d 20 69 6e 76 6f |y vary f|rom invo|
|00000810| 63 61 74 69 6f 6e 0a 74 | 6f 20 69 6e 76 6f 63 61 |cation.t|o invoca|
|00000820| 74 69 6f 6e 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |tion...(|defvar e|
|00000830| 64 69 66 66 2d 6d 6f 64 | 65 2d 6d 61 70 20 6e 69 |diff-mod|e-map ni|
|00000840| 6c 20 28 23 24 20 2e 20 | 31 39 36 32 29 29 0a 28 |l (#$ . |1962)).(|
|00000850| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000860| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000870| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000880| 61 6c 20 65 64 69 66 66 | 2d 6d 6f 64 65 2d 6d 61 |al ediff|-mode-ma|
|00000890| 70 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |p put pe|rmanent-|
|000008a0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 33 36 |local t]| 4).#@36|
|000008b0| 20 53 65 74 20 75 70 20 | 45 64 69 66 66 20 6b 65 | Set up |Ediff ke|
|000008c0| 79 6d 61 70 2c 20 69 66 | 20 6e 65 63 65 73 73 61 |ymap, if| necessa|
|000008d0| 72 79 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |ry...(de|falias '|
|000008e0| 65 64 69 66 66 2d 73 65 | 74 2d 6b 65 79 73 20 23 |ediff-se|t-keys #|
|000008f0| 5b 6e 69 6c 20 22 08 ac | 83 c1 20 88 c2 08 21 87 |[nil "..|.. ...!.|
|00000900| 22 20 5b 65 64 69 66 66 | 2d 6d 6f 64 65 2d 6d 61 |" [ediff|-mode-ma|
|00000910| 70 20 65 64 69 66 66 2d | 73 65 74 75 70 2d 6b 65 |p ediff-|setup-ke|
|00000920| 79 6d 61 70 20 75 73 65 | 2d 6c 6f 63 61 6c 2d 6d |ymap use|-local-m|
|00000930| 61 70 5d 20 32 20 28 23 | 24 20 2e 20 32 32 32 35 |ap] 2 (#|$ . 2225|
|00000940| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|00000950| 64 69 66 66 2d 72 65 6c | 6f 61 64 2d 6b 65 79 6d |diff-rel|oad-keym|
|00000960| 61 70 20 23 5b 6e 69 6c | 20 22 c0 11 c2 20 87 22 |ap #[nil| "... ."|
|00000970| 20 5b 6e 69 6c 20 65 64 | 69 66 66 2d 6d 6f 64 65 | [nil ed|iff-mode|
|00000980| 2d 6d 61 70 20 65 64 69 | 66 66 2d 73 65 74 2d 6b |-map edi|ff-set-k|
|00000990| 65 79 73 5d 20 31 20 6e | 69 6c 20 6e 69 6c 5d 29 |eys] 1 n|il nil])|
|000009a0| 0a 23 40 35 36 20 53 65 | 74 20 75 70 20 74 68 65 |.#@56 Se|t up the|
|000009b0| 20 6b 65 79 6d 61 70 20 | 75 73 65 64 20 69 6e 20 | keymap |used in |
|000009c0| 74 68 65 20 63 6f 6e 74 | 72 6f 6c 20 62 75 66 66 |the cont|rol buff|
|000009d0| 65 72 20 6f 66 20 45 64 | 69 66 66 2e 1f 0a 28 64 |er of Ed|iff...(d|
|000009e0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|000009f0| 65 74 75 70 2d 6b 65 79 | 6d 61 70 20 23 5b 6e 69 |etup-key|map #[ni|
|00000a00| 6c 20 22 c0 20 11 c2 09 | 21 88 c3 09 0c ab 83 c5 |l ". ...|!.......|
|00000a10| aa 81 c6 c7 23 88 c3 09 | c8 c7 23 88 c3 09 c9 ca |....#...|..#.....|
|00000a20| 23 88 c3 09 cb ca 23 88 | c3 09 cc ca 23 88 c3 09 |#.....#.|....#...|
|00000a30| cd 0e 0e ad 81 ca 23 88 | c3 09 cf ca 23 88 c3 09 |......#.|....#...|
|00000a40| d0 d1 23 88 c3 09 d2 d1 | 23 88 c3 09 d3 d4 23 88 |..#.....|#.....#.|
|00000a50| c3 09 d5 d6 23 88 c3 09 | d7 d8 23 88 c3 09 d9 d8 |....#...|..#.....|
|00000a60| 23 88 c3 09 da db 23 88 | c3 09 dc dd 23 88 c3 09 |#.....#.|....#...|
|00000a70| de df 23 88 c3 09 e0 e1 | 23 88 c3 09 e2 e3 23 88 |..#.....|#.....#.|
|00000a80| c3 09 e4 e5 23 88 0e 26 | ac 86 c3 09 e7 e8 23 88 |....#..&|......#.|
|00000a90| 0e 29 ab 86 c3 09 ea eb | 23 88 c3 09 ec ed 23 88 |.)......|#.....#.|
|00000aa0| c3 09 ee ef 23 88 c3 09 | f0 ef 23 88 c3 09 f1 ef |....#...|..#.....|
|00000ab0| 23 88 c3 09 f2 ef 23 88 | c3 09 f3 ef 23 88 c3 09 |#.....#.|....#...|
|00000ac0| f4 f5 23 88 c3 09 f6 f5 | 23 88 c3 09 f7 f8 23 88 |..#.....|#.....#.|
|00000ad0| c3 09 f9 fa 23 88 c3 09 | fb fc 23 88 c3 09 fd fe |....#...|..#.....|
|00000ae0| 23 88 c3 09 ff 81 40 00 | 23 88 c3 09 81 41 00 81 |#.....@.|#....A..|
|00000af0| 42 00 23 88 0e 26 ac 8a | c3 09 81 43 00 81 44 00 |B.#..&..|...C..D.|
|00000b00| 23 88 c3 09 81 45 00 d6 | 23 88 c3 09 81 46 00 d6 |#....E..|#....F..|
|00000b10| 23 88 c3 09 81 47 00 d6 | 23 88 0e 48 ab d3 c3 09 |#....G..|#..H....|
|00000b20| 81 49 00 81 4a 00 23 88 | c3 09 81 45 00 81 4b 00 |.I..J.#.|...E..K.|
|00000b30| 23 88 c3 09 81 46 00 81 | 4c 00 23 88 c3 09 81 47 |#....F..|L.#....G|
|00000b40| 00 81 4d 00 23 88 c3 09 | 81 4e 00 81 4f 00 23 88 |..M.#...|.N..O.#.|
|00000b50| c3 09 81 50 00 81 51 00 | 23 88 c3 09 81 52 00 81 |...P..Q.|#....R..|
|00000b60| 53 00 23 88 c3 09 81 54 | 00 81 55 00 23 88 82 08 |S.#....T|..U.#...|
|00000b70| 02 0e 56 ab ee c3 09 81 | 57 00 81 58 00 23 88 c3 |..V.....|W..X.#..|
|00000b80| 09 81 59 00 81 5a 00 23 | 88 c3 09 81 5b 00 81 4b |..Y..Z.#|....[..K|
|00000b90| 00 23 88 c3 09 81 5c 5c | 00 81 4c 00 23 88 c3 09 |.#....\\|..L.#...|
|00000ba0| 81 5d 00 d6 23 88 c3 09 | 81 5e 00 81 5f 00 23 88 |.]..#...|.^.._.#.|
|00000bb0| c3 09 81 60 00 81 61 00 | 23 88 c3 09 81 62 00 81 |...`..a.|#....b..|
|00000bc0| 63 00 23 88 c3 09 81 64 | 00 81 63 00 23 88 c3 09 |c.#....d|..c.#...|
|00000bd0| 81 65 00 81 63 00 23 88 | c3 09 81 66 00 81 67 00 |.e..c.#.|...f..g.|
|00000be0| 23 88 aa a8 c3 09 81 45 | 00 81 58 00 23 88 c3 09 |#......E|..X.#...|
|00000bf0| 81 46 00 81 5a 00 23 88 | c3 09 81 62 00 81 63 00 |.F..Z.#.|...b..c.|
|00000c00| 23 88 c3 09 81 64 00 81 | 63 00 23 88 c3 09 81 68 |#....d..|c.#....h|
|00000c10| 00 81 69 00 23 88 c3 09 | 81 6a 00 d6 23 88 c3 09 |..i.#...|.j..#...|
|00000c20| 81 6b 00 81 6c 00 23 88 | c3 09 81 6d 00 81 6c 00 |.k..l.#.|...m..l.|
|00000c30| 23 88 0e 26 ac 8a c3 09 | 81 6e 00 81 6f 00 23 88 |#..&....|.n..o.#.|
|00000c40| c3 09 81 70 00 d6 23 88 | c3 09 81 71 00 81 67 00 |...p..#.|...q..g.|
|00000c50| 23 88 c3 09 81 72 00 81 | 67 00 23 88 c3 09 81 73 |#....r..|g.#....s|
|00000c60| 00 d6 23 88 c3 09 81 74 | 00 81 75 00 23 88 c3 09 |..#....t|..u.#...|
|00000c70| 81 76 00 81 75 00 23 88 | c3 09 81 77 00 81 75 00 |.v..u.#.|...w..u.|
|00000c80| 23 88 c3 09 81 78 00 81 | 79 00 23 88 81 7a 00 81 |#....x..|y.#..z..|
|00000c90| 7b 00 21 ab 8a c3 09 81 | 7c 00 81 7b 00 23 88 0e |{.!.....||..{.#..|
|00000ca0| 7d ab 92 c3 09 81 7e 00 | 81 75 00 23 88 c3 09 81 |}.....~.|.u.#....|
|00000cb0| 7f 00 d8 23 88 c3 09 81 | 80 00 81 81 00 23 88 c1 |...#....|.....#..|
|00000cc0| 09 4d 88 81 82 00 81 83 | 00 21 87 22 20 5b 6d 61 |.M......|.!." [ma|
|00000cd0| 6b 65 2d 73 70 61 72 73 | 65 2d 6b 65 79 6d 61 70 |ke-spars|e-keymap|
|00000ce0| 20 65 64 69 66 66 2d 6d | 6f 64 65 2d 6d 61 70 20 | ediff-m|ode-map |
|00000cf0| 73 75 70 70 72 65 73 73 | 2d 6b 65 79 6d 61 70 20 |suppress|-keymap |
|00000d00| 64 65 66 69 6e 65 2d 6b | 65 79 20 65 64 69 66 66 |define-k|ey ediff|
|00000d10| 2d 65 6d 61 63 73 2d 70 | 20 5b 6d 6f 75 73 65 2d |-emacs-p| [mouse-|
|00000d20| 32 5d 20 5b 62 75 74 74 | 6f 6e 32 5d 20 65 64 69 |2] [butt|on2] edi|
|00000d30| 66 66 2d 68 65 6c 70 2d | 66 6f 72 2d 71 75 69 63 |ff-help-|for-quic|
|00000d40| 6b 2d 68 65 6c 70 20 22 | 0d 22 20 22 70 22 20 65 |k-help "|." "p" e|
|00000d50| 64 69 66 66 2d 70 72 65 | 76 69 6f 75 73 2d 64 69 |diff-pre|vious-di|
|00000d60| 66 66 65 72 65 6e 63 65 | 20 22 7f 22 20 5b 64 65 |fference| "." [de|
|00000d70| 6c 65 74 65 5d 20 22 08 | 22 20 65 64 69 66 66 2d |lete] ".|" ediff-|
|00000d80| 6e 6f 2d 65 6d 61 63 73 | 2d 68 65 6c 70 2d 69 6e |no-emacs|-help-in|
|00000d90| 2d 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 |-control|-buffer |
|00000da0| 5b 62 61 63 6b 73 70 61 | 63 65 5d 20 22 6e 22 20 |[backspa|ce] "n" |
|00000db0| 65 64 69 66 66 2d 6e 65 | 78 74 2d 64 69 66 66 65 |ediff-ne|xt-diffe|
|00000dc0| 72 65 6e 63 65 20 22 20 | 22 20 22 6a 22 20 65 64 |rence " |" "j" ed|
|00000dd0| 69 66 66 2d 6a 75 6d 70 | 2d 74 6f 2d 64 69 66 66 |iff-jump|-to-diff|
|00000de0| 65 72 65 6e 63 65 20 22 | 67 22 20 6e 69 6c 20 22 |erence "|g" nil "|
|00000df0| 67 61 22 20 65 64 69 66 | 66 2d 6a 75 6d 70 2d 74 |ga" edif|f-jump-t|
|00000e00| 6f 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 61 74 2d |o-differ|ence-at-|
|00000e10| 70 6f 69 6e 74 20 22 67 | 62 22 20 22 71 22 20 65 |point "g|b" "q" e|
|00000e20| 64 69 66 66 2d 71 75 69 | 74 20 22 44 22 20 65 64 |diff-qui|t "D" ed|
|00000e30| 69 66 66 2d 73 68 6f 77 | 2d 64 69 66 66 2d 6f 75 |iff-show|-diff-ou|
|00000e40| 74 70 75 74 20 22 7a 22 | 20 65 64 69 66 66 2d 73 |tput "z"| ediff-s|
|00000e50| 75 73 70 65 6e 64 20 22 | 0c 22 20 65 64 69 66 66 |uspend "|." ediff|
|00000e60| 2d 72 65 63 65 6e 74 65 | 72 20 22 7c 22 20 65 64 |-recente|r "|" ed|
|00000e70| 69 66 66 2d 74 6f 67 67 | 6c 65 2d 73 70 6c 69 74 |iff-togg|le-split|
|00000e80| 20 22 68 22 20 65 64 69 | 66 66 2d 74 6f 67 67 6c | "h" edi|ff-toggl|
|00000e90| 65 2d 68 69 6c 69 74 20 | 65 64 69 66 66 2d 77 6f |e-hilit |ediff-wo|
|00000ea0| 72 64 2d 6d 6f 64 65 20 | 22 40 22 20 65 64 69 66 |rd-mode |"@" edif|
|00000eb0| 66 2d 74 6f 67 67 6c 65 | 2d 61 75 74 6f 72 65 66 |f-toggle|-autoref|
|00000ec0| 69 6e 65 20 65 64 69 66 | 66 2d 6e 61 72 72 6f 77 |ine edif|f-narrow|
|00000ed0| 2d 6a 6f 62 20 22 25 22 | 20 65 64 69 66 66 2d 74 |-job "%"| ediff-t|
|00000ee0| 6f 67 67 6c 65 2d 6e 61 | 72 72 6f 77 2d 72 65 67 |oggle-na|rrow-reg|
|00000ef0| 69 6f 6e 20 22 7e 22 20 | 65 64 69 66 66 2d 73 77 |ion "~" |ediff-sw|
|00000f00| 61 70 2d 62 75 66 66 65 | 72 73 20 22 76 22 20 65 |ap-buffe|rs "v" e|
|00000f10| 64 69 66 66 2d 73 63 72 | 6f 6c 6c 2d 76 65 72 74 |diff-scr|oll-vert|
|00000f20| 69 63 61 6c 6c 79 20 22 | 16 22 20 22 5e 22 20 22 |ically "|." "^" "|
|00000f30| f6 22 20 22 56 22 20 22 | 3c 22 20 65 64 69 66 66 |." "V" "|<" ediff|
|00000f40| 2d 73 63 72 6f 6c 6c 2d | 68 6f 72 69 7a 6f 6e 74 |-scroll-|horizont|
|00000f50| 61 6c 6c 79 20 22 3e 22 | 20 22 69 22 20 65 64 69 |ally ">"| "i" edi|
|00000f60| 66 66 2d 73 74 61 74 75 | 73 2d 69 6e 66 6f 20 22 |ff-statu|s-info "|
|00000f70| 45 22 20 65 64 69 66 66 | 2d 64 6f 63 75 6d 65 6e |E" ediff|-documen|
|00000f80| 74 61 74 69 6f 6e 20 22 | 3f 22 20 65 64 69 66 66 |tation "|?" ediff|
|00000f90| 2d 74 6f 67 67 6c 65 2d | 68 65 6c 70 20 22 21 22 |-toggle-|help "!"|
|00000fa0| 20 65 64 69 66 66 2d 75 | 70 64 61 74 65 2d 64 69 | ediff-u|pdate-di|
|00000fb0| 66 66 73 20 22 4d 22 20 | 65 64 69 66 66 2d 73 68 |ffs "M" |ediff-sh|
|00000fc0| 6f 77 2d 63 75 72 72 65 | 6e 74 2d 73 65 73 73 69 |ow-curre|nt-sessi|
|00000fd0| 6f 6e 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 22 |on-meta-|buffer "|
|00000fe0| 52 22 20 65 64 69 66 66 | 2d 73 68 6f 77 2d 72 65 |R" ediff|-show-re|
|00000ff0| 67 69 73 74 72 79 20 22 | 2a 22 20 65 64 69 66 66 |gistry "|*" ediff|
|00001000| 2d 6d 61 6b 65 2d 6f 72 | 2d 6b 69 6c 6c 2d 66 69 |-make-or|-kill-fi|
|00001010| 6e 65 2d 64 69 66 66 73 | 20 22 61 22 20 22 62 22 |ne-diffs| "a" "b"|
|00001020| 20 22 72 22 20 65 64 69 | 66 66 2d 6d 65 72 67 65 | "r" edi|ff-merge|
|00001030| 2d 6a 6f 62 20 22 2f 22 | 20 65 64 69 66 66 2d 73 |-job "/"| ediff-s|
|00001040| 68 6f 77 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |how-ance|stor edi|
|00001050| 66 66 2d 63 6f 70 79 2d | 41 2d 74 6f 2d 43 20 65 |ff-copy-|A-to-C e|
|00001060| 64 69 66 66 2d 63 6f 70 | 79 2d 42 2d 74 6f 2d 43 |diff-cop|y-B-to-C|
|00001070| 20 65 64 69 66 66 2d 72 | 65 73 74 6f 72 65 2d 64 | ediff-r|estore-d|
|00001080| 69 66 66 2d 69 6e 2d 6d | 65 72 67 65 2d 62 75 66 |iff-in-m|erge-buf|
|00001090| 66 65 72 20 22 73 22 20 | 65 64 69 66 66 2d 73 68 |fer "s" |ediff-sh|
|000010a0| 72 69 6e 6b 2d 77 69 6e | 64 6f 77 2d 43 20 22 2b |rink-win|dow-C "+|
|000010b0| 22 20 65 64 69 66 66 2d | 63 6f 6d 62 69 6e 65 2d |" ediff-|combine-|
|000010c0| 64 69 66 66 73 20 22 24 | 22 20 65 64 69 66 66 2d |diffs "$|" ediff-|
|000010d0| 74 6f 67 67 6c 65 2d 73 | 68 6f 77 2d 63 6c 61 73 |toggle-s|how-clas|
|000010e0| 68 65 73 2d 6f 6e 6c 79 | 20 22 26 22 20 65 64 69 |hes-only| "&" edi|
|000010f0| 66 66 2d 72 65 2d 6d 65 | 72 67 65 20 65 64 69 66 |ff-re-me|rge edif|
|00001100| 66 2d 33 77 61 79 2d 63 | 6f 6d 70 61 72 69 73 6f |f-3way-c|ompariso|
|00001110| 6e 2d 6a 6f 62 20 22 61 | 62 22 20 65 64 69 66 66 |n-job "a|b" ediff|
|00001120| 2d 63 6f 70 79 2d 41 2d | 74 6f 2d 42 20 22 62 61 |-copy-A-|to-B "ba|
|00001130| 22 20 65 64 69 66 66 2d | 63 6f 70 79 2d 42 2d 74 |" ediff-|copy-B-t|
|00001140| 6f 2d 41 20 22 61 63 22 | 20 22 62 63 22 20 22 63 |o-A "ac"| "bc" "c|
|00001150| 22 20 22 63 61 22 20 65 | 64 69 66 66 2d 63 6f 70 |" "ca" e|diff-cop|
|00001160| 79 2d 43 2d 74 6f 2d 41 | 20 22 63 62 22 20 65 64 |y-C-to-A| "cb" ed|
|00001170| 69 66 66 2d 63 6f 70 79 | 2d 43 2d 74 6f 2d 42 20 |iff-copy|-C-to-B |
|00001180| 22 72 61 22 20 65 64 69 | 66 66 2d 72 65 73 74 6f |"ra" edi|ff-resto|
|00001190| 72 65 2d 64 69 66 66 20 | 22 72 62 22 20 22 72 63 |re-diff |"rb" "rc|
|000011a0| 22 20 22 43 22 20 65 64 | 69 66 66 2d 74 6f 67 67 |" "C" ed|iff-togg|
|000011b0| 6c 65 2d 72 65 61 64 2d | 6f 6e 6c 79 20 22 47 22 |le-read-|only "G"|
|000011c0| 20 65 64 69 66 66 2d 73 | 75 62 6d 69 74 2d 72 65 | ediff-s|ubmit-re|
|000011d0| 70 6f 72 74 20 22 23 22 | 20 22 23 68 22 20 65 64 |port "#"| "#h" ed|
|000011e0| 69 66 66 2d 74 6f 67 67 | 6c 65 2d 72 65 67 65 78 |iff-togg|le-regex|
|000011f0| 70 2d 6d 61 74 63 68 20 | 22 23 66 22 20 22 23 23 |p-match |"#f" "##|
|00001200| 22 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 73 |" ediff-|toggle-s|
|00001210| 6b 69 70 2d 73 69 6d 69 | 6c 61 72 20 22 6f 22 20 |kip-simi|lar "o" |
|00001220| 22 41 22 20 22 42 22 20 | 22 77 22 20 22 77 61 22 |"A" "B" |"w" "wa"|
|00001230| 20 65 64 69 66 66 2d 73 | 61 76 65 2d 62 75 66 66 | ediff-s|ave-buff|
|00001240| 65 72 20 22 77 62 22 20 | 22 77 64 22 20 22 3d 22 |er "wb" |"wd" "="|
|00001250| 20 65 64 69 66 66 2d 69 | 6e 66 65 72 69 6f 72 2d | ediff-i|nferior-|
|00001260| 63 6f 6d 70 61 72 65 2d | 72 65 67 69 6f 6e 73 20 |compare-|regions |
|00001270| 66 62 6f 75 6e 64 70 20 | 65 64 69 66 66 2d 73 68 |fboundp |ediff-sh|
|00001280| 6f 77 2d 70 61 74 63 68 | 2d 64 69 61 67 6e 6f 73 |ow-patch|-diagnos|
|00001290| 74 69 63 73 20 22 50 22 | 20 65 64 69 66 66 2d 33 |tics "P"| ediff-3|
|000012a0| 77 61 79 2d 6a 6f 62 20 | 22 77 63 22 20 22 67 63 |way-job |"wc" "gc|
|000012b0| 22 20 22 6d 22 20 65 64 | 69 66 66 2d 74 6f 67 67 |" "m" ed|iff-togg|
|000012c0| 6c 65 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 20 |le-wide-|display |
|000012d0| 72 75 6e 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |run-hook|s ediff-|
|000012e0| 6b 65 79 6d 61 70 2d 73 | 65 74 75 70 2d 68 6f 6f |keymap-s|etup-hoo|
|000012f0| 6b 5d 20 34 20 28 23 24 | 20 2e 20 32 34 37 30 29 |k] 4 (#$| . 2470)|
|00001300| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00001310| 69 66 66 2d 73 65 74 75 | 70 20 23 5b 28 62 75 66 |iff-setu|p #[(buf|
|00001320| 66 65 72 2d 41 20 66 69 | 6c 65 2d 41 20 62 75 66 |fer-A fi|le-A buf|
|00001330| 66 65 72 2d 42 20 66 69 | 6c 65 2d 42 20 62 75 66 |fer-B fi|le-B buf|
|00001340| 66 65 72 2d 43 20 66 69 | 6c 65 2d 43 20 73 74 61 |fer-C fi|le-C sta|
|00001350| 72 74 75 70 2d 68 6f 6f | 6b 73 20 73 65 74 75 70 |rtup-hoo|ks setup|
|00001360| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 26 6f 70 74 |-paramet|ers &opt|
|00001370| 69 6f 6e 61 6c 20 6d 65 | 72 67 65 2d 62 75 66 66 |ional me|rge-buff|
|00001380| 65 72 2d 66 69 6c 65 29 | 20 22 c0 c1 5c 6e 21 21 |er-file)| "..\n!!|
|00001390| 12 c0 c1 0b 21 21 13 0c | 3b ab 86 c0 c1 0c 21 21 |....!!..|;.....!!|
|000013a0| 14 0d 3b ab a7 c0 c1 0d | 21 21 15 c6 c7 0d 21 21 |..;.....|!!....!!|
|000013b0| ac 89 c8 c9 ca c7 0d 21 | 21 5c 22 88 c6 0d 21 ab |.......!|!\"...!.|
|000013c0| 8c cb 0d 21 ab 87 c8 cc | ca 0d 21 5c 22 88 cd ce |...!....|..!\"...|
|000013d0| cf 5c 22 1e 10 0e 11 ab | 9a d2 0e 11 21 ab 94 d3 |.\".....|....!...|
|000013e0| d2 0e 11 21 21 ab 8c 72 | 0e 11 71 88 d4 0e 10 21 |...!!..r|..q....!|
|000013f0| 29 aa 8a 0e 15 d6 61 ae | 84 c8 0e 17 21 89 1e 18 |).....a.|....!...|
|00001400| 83 c1 05 d2 0e 18 21 83 | c1 05 d3 d2 0e 18 21 21 |......!.|......!!|
|00001410| 83 c1 05 72 0e 18 71 88 | d9 20 88 da db 21 88 da |...r..q.|. ...!..|
|00001420| dc 21 88 da dd 21 88 da | de 21 88 da df 21 88 da |.!...!..|.!...!..|
|00001430| e0 21 88 da e1 21 88 0e | 5c 22 ab 92 0e 5c 22 40 |.!...!..|\"...\"@|
|00001440| 40 0e 5c 22 40 41 4c 88 | 0e 5c 22 41 89 16 5c 22 |@.\"@AL.|.\"A..\"|
|00001450| ac 6e 0e 23 e4 73 16 25 | 0e 23 e6 73 16 27 0e 23 |.n.#.s.%|.#.s.'.#|
|00001460| e8 73 16 29 0e 25 ae 82 | 0e 27 16 2a 0e 25 ae 82 |.s.).%..|.'.*.%..|
|00001470| 0e 29 16 2b 0e 23 ec 73 | 16 2d 0e 23 ee 73 16 2f |.).+.#.s|.-.#.s./|
|00001480| 0e 23 f0 73 16 31 f2 f3 | f4 0e 23 21 5c 22 ab 83 |.#.s.1..|..#!\"..|
|00001490| f5 16 21 f6 f7 21 88 f8 | 20 ab 87 f9 f7 fa fb f5 |..!..!..| .......|
|000014a0| 24 88 fc 20 16 3d 0e 27 | ab e0 0e 1e fe 61 ab 84 |$.. .=.'|.....a..|
|000014b0| 0e 3f aa 82 0e 11 1e 40 | 0e 41 16 1d 0e 42 16 43 |.?.....@|.A...B.C|
|000014c0| d4 cd 81 44 00 cf 5c 22 | 21 16 42 8a 0e 42 71 88 |...D..\"|!.B..Bq.|
|000014d0| 81 45 00 0e 40 21 88 0e | 40 ab 98 d2 0e 40 21 ab |.E..@!..|@....@!.|
|000014e0| 92 d3 d2 0e 40 21 21 ab | 8a 72 0e 40 71 88 0e 46 |....@!!.|.r.@q..F|
|000014f0| 29 aa 8a 0e 15 d6 61 ae | 84 c8 0e 17 21 20 88 f9 |).....a.|....! ..|
|00001500| 81 47 00 81 48 00 fb f5 | 24 88 2a fb 16 49 0e 11 |.G..H...|$.*..I..|
|00001510| 16 4a 0e 3f 16 4b 0e 42 | 16 4c 0e 18 16 4d f2 81 |.J.?.K.B|.L...M..|
|00001520| 4e 00 0e 10 5c 22 ab 8d | 0e 10 81 4f 00 94 81 4f |N...\"..|...O...O|
|00001530| 00 95 4f aa 83 81 50 00 | 16 51 81 4f 00 81 52 00 |..O...P.|.Q.O..R.|
|00001540| 0e 51 f2 81 53 00 0e 51 | 5c 22 ae 83 81 4f 00 fb |.Q..S..Q|\"...O..|
|00001550| 4f 21 53 5d 16 54 d4 cd | 81 55 00 cf 5c 22 21 16 |O!S].T..|.U..\"!.|
|00001560| 56 0e 11 ab a7 d2 0e 11 | 21 ab a1 d3 d2 0e 11 21 |V.......|!......!|
|00001570| 21 ab 99 72 0e 11 71 88 | 0e 57 40 81 58 00 b6 ab |!..r..q.|.W@.X...|
|00001580| 88 81 59 00 0e 57 38 16 | 57 29 aa 8b 0e 15 d6 61 |..Y..W8.|W).....a|
|00001590| ac 85 c8 0e 17 21 88 0e | 3f ab a7 d2 0e 3f 21 ab |.....!..|?....?!.|
|000015a0| a1 d3 d2 0e 3f 21 21 ab | 99 72 0e 3f 71 88 0e 57 |....?!!.|.r.?q..W|
|000015b0| 40 81 58 00 b6 ab 88 81 | 59 00 0e 57 38 16 57 29 |@.X.....|Y..W8.W)|
|000015c0| aa 8b 0e 15 d6 61 ac 85 | c8 0e 17 21 88 0e 2a ab |.....a..|...!..*.|
|000015d0| b6 0e 42 ab a7 d2 0e 42 | 21 ab a1 d3 d2 0e 42 21 |..B....B|!.....B!|
|000015e0| 21 ab 99 72 0e 42 71 88 | 0e 57 40 81 58 00 b6 ab |!..r.Bq.|.W@.X...|
|000015f0| 88 81 59 00 0e 57 38 16 | 57 29 aa 8b 0e 15 d6 61 |..Y..W8.|W).....a|
|00001600| ac 85 c8 0e 17 21 88 0e | 43 ab c4 d2 0e 43 21 ab |.....!..|C....C!.|
|00001610| be d3 d2 0e 43 21 21 ab | b6 0e 43 ab a7 d2 0e 43 |....C!!.|..C....C|
|00001620| 21 ab a1 d3 d2 0e 43 21 | 21 ab 99 72 0e 43 71 88 |!.....C!|!..r.Cq.|
|00001630| 0e 57 40 81 58 00 b6 ab | 88 81 59 00 0e 57 38 16 |.W@.X...|..Y..W8.|
|00001640| 57 29 aa 8b 0e 15 d6 61 | ac 85 c8 0e 17 21 88 81 |W).....a|.....!..|
|00001650| 5a 00 20 88 0e 2b ab 85 | 81 5b 00 aa 83 81 5c 5c |Z. ..+..|.[....\\|
|00001660| 00 16 5d 81 5e 00 81 5f | 00 81 60 00 0e 4a 23 81 |..].^.._|..`..J#.|
|00001670| 5e 00 81 61 00 81 62 00 | 0e 4b 23 81 5e 00 81 63 |^..a..b.|.K#.^..c|
|00001680| 00 81 64 00 0e 4c 23 45 | 16 65 0e 66 ab 86 0e 67 |..d..L#E|.e.f...g|
|00001690| 16 68 aa 84 0e 65 16 68 | 81 69 00 20 88 0e 67 ac |.h...e.h|.i. ..g.|
|000016a0| 84 0e 65 16 67 0e 4a ab | e3 d2 0e 4a 21 ab dd d3 |..e.g.J.|...J!...|
|000016b0| d2 0e 4a 21 21 ab d5 72 | 0e 4a 71 88 81 6a 00 20 |..J!!..r|.Jq..j. |
|000016c0| 88 81 6b 00 81 6c 00 21 | 88 0e 18 ab 98 d2 0e 18 |..k..l.!|........|
|000016d0| 21 ab 92 d3 d2 0e 18 21 | 21 ab 8a 72 0e 18 71 88 |!......!|!..r..q.|
|000016e0| 0e 27 29 aa 8a 0e 15 d6 | 61 ac 86 c8 0e 17 21 ab |.').....|a.....!.|
|000016f0| 83 f5 16 49 0e 18 0e 6d | 73 ac 87 0e 18 0e 6d 42 |...I...m|s.....mB|
|00001700| 16 6d 0e 6e ab 83 f5 16 | 49 29 aa 8b 0e 15 d6 61 |.m.n....|I).....a|
|00001710| ac 85 c8 0e 17 21 88 0e | 4b ab e3 d2 0e 4b 21 ab |.....!..|K....K!.|
|00001720| dd d3 d2 0e 4b 21 21 ab | d5 72 0e 4b 71 88 81 6a |....K!!.|.r.Kq..j|
|00001730| 00 20 88 81 6b 00 81 6c | 00 21 88 0e 18 ab 98 d2 |. ..k..l|.!......|
|00001740| 0e 18 21 ab 92 d3 d2 0e | 18 21 21 ab 8a 72 0e 18 |..!.....|.!!..r..|
|00001750| 71 88 0e 27 29 aa 8a 0e | 15 d6 61 ac 86 c8 0e 17 |q..')...|..a.....|
|00001760| 21 ab 83 f5 16 49 0e 18 | 0e 6d 73 ac 87 0e 18 0e |!....I..|.ms.....|
|00001770| 6d 42 16 6d 0e 6e ab 83 | f5 16 49 29 aa 8b 0e 15 |mB.m.n..|..I)....|
|00001780| d6 61 ac 85 c8 0e 17 21 | 88 0e 2a ab c7 0e 4c ab |.a.....!|..*...L.|
|00001790| b8 d2 0e 4c 21 ab b2 d3 | d2 0e 4c 21 21 ab aa 72 |...L!...|..L!!..r|
|000017a0| 0e 4c 71 88 81 6a 00 20 | 88 81 6b 00 81 6c 00 21 |.Lq..j. |..k..l.!|
|000017b0| 88 0e 18 0e 6d 73 ac 87 | 0e 18 0e 6d 42 16 6d 0e |....ms..|...mB.m.|
|000017c0| 6e ab 83 f5 16 49 29 aa | 8b 0e 15 d6 61 ac 85 c8 |n....I).|....a...|
|000017d0| 0e 17 21 88 0e 43 ab d1 | d2 0e 43 21 ab cb d3 d2 |..!..C..|..C!....|
|000017e0| 0e 43 21 21 ab c3 0e 43 | ab b4 d2 0e 43 21 ab ae |.C!!...C|....C!..|
|000017f0| d3 d2 0e 43 21 21 ab a6 | 72 0e 43 71 88 81 6a 00 |...C!!..|r.Cq..j.|
|00001800| 20 88 f5 16 49 81 6b 00 | 81 6c 00 21 88 0e 18 0e | ...I.k.|.l.!....|
|00001810| 6d 73 ac 87 0e 18 0e 6d | 42 16 6d 29 aa 8b 0e 15 |ms.....m|B.m)....|
|00001820| d6 61 ac 85 c8 0e 17 21 | 88 0e 5d 5c 6e 0b 0c 23 |.a.....!|..]\n..#|
|00001830| 88 0e 6f 47 16 70 81 71 | 00 16 72 81 73 00 81 74 |..oG.p.q|..r.s..t|
|00001840| 00 21 88 81 73 00 81 75 | 00 21 88 0e 2a ab 88 81 |.!..s..u|.!..*...|
|00001850| 73 00 81 76 00 21 88 0e | 29 ab 88 81 73 00 81 77 |s..v.!..|)...s..w|
|00001860| 00 21 88 81 78 00 0e 11 | 0e 3f 0e 42 0e 18 24 88 |.!..x...|.?.B..$.|
|00001870| 0e 67 40 1e 79 81 7a 00 | 0e 79 21 ad 92 0e 7b ab |.g@.y.z.|.y!...{.|
|00001880| 88 81 7c 00 0e 79 21 aa | 86 81 7d 00 0e 79 21 29 |..|..y!.|..}..y!)|
|00001890| 0e 67 41 40 1e 79 81 7a | 00 0e 79 21 ad 92 0e 7b |.gA@.y.z|..y!...{|
|000018a0| ab 88 81 7c 00 0e 79 21 | aa 86 81 7d 00 0e 79 21 |...|..y!|...}..y!|
|000018b0| 29 81 59 00 0e 67 38 1e | 79 81 7a 00 0e 79 21 ad |).Y..g8.|y.z..y!.|
|000018c0| 92 0e 7b ab 88 81 7c 00 | 0e 79 21 aa 86 81 7d 00 |..{...|.|.y!...}.|
|000018d0| 0e 79 21 29 1e 7e 1e 7f | 1e 80 8a 81 81 00 0e 82 |.y!).~..|........|
|000018e0| 21 88 0e 80 62 88 29 8a | 81 81 00 0e 83 21 88 0e |!...b.).|.....!..|
|000018f0| 7f 62 88 29 0e 2a ab 8d | 8a 81 81 00 0e 84 21 88 |.b.).*..|......!.|
|00001900| 0e 7e 62 88 29 2b 81 81 | 00 0e 85 21 88 81 86 00 |.~b.)+..|...!....|
|00001910| 20 88 81 6b 00 81 87 00 | 21 88 81 88 00 0d 21 88 | ..k....|!.....!.|
|00001920| 81 89 00 20 88 f5 16 49 | 0e 18 0e 8a 42 16 8a 81 |... ...I|....B...|
|00001930| 8b 00 20 88 0e 8c ab 98 | d2 0e 8c 21 ab 92 d3 d2 |.. .....|...!....|
|00001940| 0e 8c 21 21 ab 8a 81 8d | 00 0e 8c fb 0e 8e 23 88 |..!!....|......#.|
|00001950| 81 6b 00 81 8f 00 21 88 | 29 aa 8b 0e 15 d6 61 ac |.k....!.|).....a.|
|00001960| 85 c8 0e 17 21 88 0e 18 | 2a 87 22 20 5b 65 64 69 |....!...|*." [edi|
|00001970| 66 66 2d 63 6f 6e 76 65 | 72 74 2d 73 74 61 6e 64 |ff-conve|rt-stand|
|00001980| 61 72 64 2d 66 69 6c 65 | 6e 61 6d 65 20 65 78 70 |ard-file|name exp|
|00001990| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |and-file|-name fi|
|000019a0| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-A fil|e-B file|
|000019b0| 2d 43 20 6d 65 72 67 65 | 2d 62 75 66 66 65 72 2d |-C merge|-buffer-|
|000019c0| 66 69 6c 65 20 66 69 6c | 65 2d 65 78 69 73 74 73 |file fil|e-exists|
|000019d0| 2d 70 20 66 69 6c 65 2d | 6e 61 6d 65 2d 64 69 72 |-p file-|name-dir|
|000019e0| 65 63 74 6f 72 79 20 65 | 72 72 6f 72 20 22 44 69 |ectory e|rror "Di|
|000019f0| 72 65 63 74 6f 72 79 20 | 25 73 20 67 69 76 65 6e |rectory |%s given|
|00001a00| 20 61 73 20 70 6c 61 63 | 65 20 74 6f 20 73 61 76 | as plac|e to sav|
|00001a10| 65 20 74 68 65 20 6d 65 | 72 67 65 20 64 6f 65 73 |e the me|rge does|
|00001a20| 6e 27 74 20 65 78 69 73 | 74 2e 22 20 61 62 62 72 |n't exis|t." abbr|
|00001a30| 65 76 69 61 74 65 2d 66 | 69 6c 65 2d 6e 61 6d 65 |eviate-f|ile-name|
|00001a40| 20 66 69 6c 65 2d 64 69 | 72 65 63 74 6f 72 79 2d | file-di|rectory-|
|00001a50| 70 20 22 54 68 65 20 6d | 65 72 67 65 20 62 75 66 |p "The m|erge buf|
|00001a60| 66 65 72 20 66 69 6c 65 | 20 25 73 20 6d 75 73 74 |fer file| %s must|
|00001a70| 20 6e 6f 74 20 62 65 20 | 61 20 64 69 72 65 63 74 | not be |a direct|
|00001a80| 6f 72 79 22 20 65 64 69 | 66 66 2d 75 6e 69 71 75 |ory" edi|ff-uniqu|
|00001a90| 65 2d 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 22 2a |e-buffer|-name "*|
|00001aa0| 45 64 69 66 66 20 43 6f | 6e 74 72 6f 6c 20 50 61 |Ediff Co|ntrol Pa|
|00001ab0| 6e 65 6c 22 20 22 2a 22 | 20 63 6f 6e 74 72 6f 6c |nel" "*"| control|
|00001ac0| 2d 62 75 66 66 65 72 2d | 6e 61 6d 65 20 62 75 66 |-buffer-|name buf|
|00001ad0| 66 65 72 2d 41 20 67 65 | 74 2d 62 75 66 66 65 72 |fer-A ge|t-buffer|
|00001ae0| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 67 65 74 | buffer-|name get|
|00001af0| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 74 |-buffer-|create t|
|00001b00| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|00001b10| 66 2d 71 75 69 74 20 65 | 64 69 66 66 2d 4b 49 4c |f-quit e|diff-KIL|
|00001b20| 4c 45 44 2d 56 49 54 41 | 4c 2d 42 55 46 46 45 52 |LED-VITA|L-BUFFER|
|00001b30| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 | control|-buffer |
|00001b40| 65 64 69 66 66 2d 6d 6f | 64 65 20 6d 61 6b 65 2d |ediff-mo|de make-|
|00001b50| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 20 65 |local-va|riable e|
|00001b60| 64 69 66 66 2d 75 73 65 | 2d 6c 6f 6e 67 2d 68 65 |diff-use|-long-he|
|00001b70| 6c 70 2d 6d 65 73 73 61 | 67 65 20 65 64 69 66 66 |lp-messa|ge ediff|
|00001b80| 2d 70 72 65 66 65 72 2d | 69 63 6f 6e 69 66 69 65 |-prefer-|iconifie|
|00001b90| 64 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |d-contro|l-frame |
|00001ba0| 65 64 69 66 66 2d 73 70 | 6c 69 74 2d 77 69 6e 64 |ediff-sp|lit-wind|
|00001bb0| 6f 77 2d 66 75 6e 63 74 | 69 6f 6e 20 65 64 69 66 |ow-funct|ion edif|
|00001bc0| 66 2d 64 65 66 61 75 6c | 74 2d 76 61 72 69 61 6e |f-defaul|t-varian|
|00001bd0| 74 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |t ediff-|merge-wi|
|00001be0| 6e 64 6f 77 2d 73 68 61 | 72 65 20 65 64 69 66 66 |ndow-sha|re ediff|
|00001bf0| 2d 77 69 6e 64 6f 77 2d | 73 65 74 75 70 2d 66 75 |-window-|setup-fu|
|00001c00| 6e 63 74 69 6f 6e 20 65 | 64 69 66 66 2d 6b 65 65 |nction e|diff-kee|
|00001c10| 70 2d 76 61 72 69 61 6e | 74 73 20 73 65 74 75 70 |p-varian|ts setup|
|00001c20| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 65 64 69 66 |-paramet|ers edif|
|00001c30| 66 2d 6a 6f 62 2d 6e 61 | 6d 65 20 28 65 64 69 66 |f-job-na|me (edif|
|00001c40| 66 2d 66 69 6c 65 73 33 | 20 65 64 69 66 66 2d 62 |f-files3| ediff-b|
|00001c50| 75 66 66 65 72 73 33 29 | 20 65 64 69 66 66 2d 33 |uffers3)| ediff-3|
|00001c60| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|00001c70| 6f 62 20 28 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ob (edif|f-merge-|
|00001c80| 66 69 6c 65 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |files ed|iff-merg|
|00001c90| 65 2d 62 75 66 66 65 72 | 73 20 65 64 69 66 66 2d |e-buffer|s ediff-|
|00001ca0| 6d 65 72 67 65 2d 66 69 | 6c 65 73 2d 77 69 74 68 |merge-fi|les-with|
|00001cb0| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00001cc0| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|00001cd0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00001ce0| 66 2d 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |f-merge-|revision|
|00001cf0| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |s ediff-|merge-re|
|00001d00| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001d10| 65 73 74 6f 72 29 20 65 | 64 69 66 66 2d 6d 65 72 |estor) e|diff-mer|
|00001d20| 67 65 2d 6a 6f 62 20 28 | 65 64 69 66 66 2d 6d 65 |ge-job (|ediff-me|
|00001d30| 72 67 65 2d 66 69 6c 65 | 73 2d 77 69 74 68 2d 61 |rge-file|s-with-a|
|00001d40| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00001d50| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00001d60| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00001d70| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00001d80| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 29 20 65 |with-anc|estor) e|
|00001d90| 64 69 66 66 2d 6d 65 72 | 67 65 2d 77 69 74 68 2d |diff-mer|ge-with-|
|00001da0| 61 6e 63 65 73 74 6f 72 | 2d 6a 6f 62 20 65 64 69 |ancestor|-job edi|
|00001db0| 66 66 2d 33 77 61 79 2d | 6a 6f 62 20 65 64 69 66 |ff-3way-|job edif|
|00001dc0| 66 2d 64 69 66 66 33 2d | 6a 6f 62 20 28 65 64 69 |f-diff3-|job (edi|
|00001dd0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 77 6f 72 64 77 |ff-windo|ws-wordw|
|00001de0| 69 73 65 20 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |ise edif|f-region|
|00001df0| 73 2d 77 6f 72 64 77 69 | 73 65 20 65 64 69 66 66 |s-wordwi|se ediff|
|00001e00| 2d 77 69 6e 64 6f 77 73 | 2d 6c 69 6e 65 77 69 73 |-windows|-linewis|
|00001e10| 65 20 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d |e ediff-|regions-|
|00001e20| 6c 69 6e 65 77 69 73 65 | 29 20 65 64 69 66 66 2d |linewise|) ediff-|
|00001e30| 6e 61 72 72 6f 77 2d 6a | 6f 62 20 28 65 64 69 66 |narrow-j|ob (edif|
|00001e40| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|00001e50| 73 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |se ediff|-windows|
|00001e60| 2d 6c 69 6e 65 77 69 73 | 65 29 20 65 64 69 66 66 |-linewis|e) ediff|
|00001e70| 2d 77 69 6e 64 6f 77 73 | 2d 6a 6f 62 20 28 65 64 |-windows|-job (ed|
|00001e80| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 77 6f 72 64 |iff-wind|ows-word|
|00001e90| 77 69 73 65 20 65 64 69 | 66 66 2d 72 65 67 69 6f |wise edi|ff-regio|
|00001ea0| 6e 73 2d 77 6f 72 64 77 | 69 73 65 29 20 65 64 69 |ns-wordw|ise) edi|
|00001eb0| 66 66 2d 77 6f 72 64 2d | 6d 6f 64 65 2d 6a 6f 62 |ff-word-|mode-job|
|00001ec0| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 62 | string-|match "b|
|00001ed0| 75 66 66 65 72 22 20 73 | 79 6d 62 6f 6c 2d 6e 61 |uffer" s|ymbol-na|
|00001ee0| 6d 65 20 74 20 6d 61 6b | 65 2d 6c 6f 63 61 6c 2d |me t mak|e-local-|
|00001ef0| 68 6f 6f 6b 20 70 72 65 | 2d 63 6f 6d 6d 61 6e 64 |hook pre|-command|
|00001f00| 2d 68 6f 6f 6b 20 65 64 | 69 66 66 2d 77 69 6e 64 |-hook ed|iff-wind|
|00001f10| 6f 77 2d 64 69 73 70 6c | 61 79 2d 70 20 61 64 64 |ow-displ|ay-p add|
|00001f20| 2d 68 6f 6f 6b 20 65 64 | 69 66 66 2d 73 70 79 2d |-hook ed|iff-spy-|
|00001f30| 61 66 74 65 72 2d 6d 6f | 75 73 65 20 6e 69 6c 20 |after-mo|use nil |
|00001f40| 6d 6f 75 73 65 2d 70 69 | 78 65 6c 2d 70 6f 73 69 |mouse-pi|xel-posi|
|00001f50| 74 69 6f 6e 20 65 64 69 | 66 66 2d 6d 6f 75 73 65 |tion edi|ff-mouse|
|00001f60| 2d 70 69 78 65 6c 2d 70 | 6f 73 69 74 69 6f 6e 20 |-pixel-p|osition |
|00001f70| 64 65 66 61 75 6c 74 2d | 42 20 62 75 66 66 65 72 |default-|B buffer|
|00001f80| 2d 42 20 62 75 66 20 65 | 64 69 66 66 2d 6d 65 72 |-B buf e|diff-mer|
|00001f90| 67 65 2d 73 70 6c 69 74 | 2d 77 69 6e 64 6f 77 2d |ge-split|-window-|
|00001fa0| 66 75 6e 63 74 69 6f 6e | 20 62 75 66 66 65 72 2d |function| buffer-|
|00001fb0| 43 20 65 64 69 66 66 2d | 61 6e 63 65 73 74 6f 72 |C ediff-|ancestor|
|00001fc0| 2d 62 75 66 66 65 72 20 | 22 2a 65 64 69 66 66 2d |-buffer |"*ediff-|
|00001fd0| 6d 65 72 67 65 22 20 69 | 6e 73 65 72 74 2d 62 75 |merge" i|nsert-bu|
|00001fe0| 66 66 65 72 20 6d 61 6a | 6f 72 2d 6d 6f 64 65 20 |ffer maj|or-mode |
|00001ff0| 6c 6f 63 61 6c 2d 77 72 | 69 74 65 2d 66 69 6c 65 |local-wr|ite-file|
|00002000| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 73 65 74 |-hooks e|diff-set|
|00002010| 2d 6d 65 72 67 65 2d 6d | 6f 64 65 20 62 75 66 66 |-merge-m|ode buff|
|00002020| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 65 64 69 |er-read-|only edi|
|00002030| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 65 64 69 66 |ff-buffe|r-A edif|
|00002040| 66 2d 62 75 66 66 65 72 | 2d 42 20 65 64 69 66 66 |f-buffer|-B ediff|
|00002050| 2d 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d |-buffer-|C ediff-|
|00002060| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 22 |control-|buffer "|
|00002070| 3c 5b 30 2d 39 5d 2a 3e | 22 20 30 20 22 22 20 65 |<[0-9]*>|" 0 "" e|
|00002080| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |diff-con|trol-buf|
|00002090| 66 65 72 2d 73 75 66 66 | 69 78 20 73 74 72 69 6e |fer-suff|ix strin|
|000020a0| 67 2d 74 6f 2d 6e 75 6d | 62 65 72 20 22 5b 30 2d |g-to-num|ber "[0-|
|000020b0| 39 5d 2b 22 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |9]+" edi|ff-contr|
|000020c0| 6f 6c 2d 62 75 66 66 65 | 72 2d 6e 75 6d 62 65 72 |ol-buffe|r-number|
|000020d0| 20 22 2a 65 64 69 66 66 | 2d 65 72 72 6f 72 73 22 | "*ediff|-errors"|
|000020e0| 20 65 64 69 66 66 2d 65 | 72 72 6f 72 2d 62 75 66 | ediff-e|rror-buf|
|000020f0| 66 65 72 20 6d 6f 64 65 | 2d 6c 69 6e 65 2d 66 6f |fer mode|-line-fo|
|00002100| 72 6d 61 74 20 28 22 20 | 41 3a 20 22 20 22 20 42 |rmat (" |A: " " B|
|00002110| 3a 20 22 20 22 20 43 3a | 20 22 20 22 20 41 6e 63 |: " " C:| " " Anc|
|00002120| 65 73 74 6f 72 3a 20 22 | 29 20 32 20 65 64 69 66 |estor: "|) 2 edif|
|00002130| 66 2d 73 61 76 65 2d 70 | 72 6f 74 65 63 74 65 64 |f-save-p|rotected|
|00002140| 2d 76 61 72 69 61 62 6c | 65 73 20 65 64 69 66 66 |-variabl|es ediff|
|00002150| 2d 73 65 74 75 70 2d 64 | 69 66 66 2d 72 65 67 69 |-setup-d|iff-regi|
|00002160| 6f 6e 73 33 20 65 64 69 | 66 66 2d 73 65 74 75 70 |ons3 edi|ff-setup|
|00002170| 2d 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 20 65 64 |-diff-re|gions ed|
|00002180| 69 66 66 2d 73 65 74 75 | 70 2d 64 69 66 66 2d 72 |iff-setu|p-diff-r|
|00002190| 65 67 69 6f 6e 73 2d 66 | 75 6e 63 74 69 6f 6e 20 |egions-f|unction |
|000021a0| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 62 75 6c 6c 65 |ediff-ma|ke-bulle|
|000021b0| 74 2d 70 72 6f 6f 66 2d | 6f 76 65 72 6c 61 79 20 |t-proof-|overlay |
|000021c0| 28 70 6f 69 6e 74 2d 6d | 69 6e 29 20 28 70 6f 69 |(point-m|in) (poi|
|000021d0| 6e 74 2d 6d 61 78 29 20 | 28 70 6f 69 6e 74 2d 6d |nt-max) |(point-m|
|000021e0| 69 6e 29 20 28 70 6f 69 | 6e 74 2d 6d 61 78 29 20 |in) (poi|nt-max) |
|000021f0| 28 70 6f 69 6e 74 2d 6d | 69 6e 29 20 28 70 6f 69 |(point-m|in) (poi|
|00002200| 6e 74 2d 6d 61 78 29 20 | 65 64 69 66 66 2d 77 69 |nt-max) |ediff-wi|
|00002210| 64 65 2d 62 6f 75 6e 64 | 73 20 65 64 69 66 66 2d |de-bound|s ediff-|
|00002220| 73 74 61 72 74 2d 6e 61 | 72 72 6f 77 65 64 20 65 |start-na|rrowed e|
|00002230| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 62 6f 75 6e |diff-nar|row-boun|
|00002240| 64 73 20 65 64 69 66 66 | 2d 76 69 73 69 62 6c 65 |ds ediff|-visible|
|00002250| 2d 62 6f 75 6e 64 73 20 | 65 64 69 66 66 2d 73 65 |-bounds |ediff-se|
|00002260| 74 2d 6b 65 79 73 20 65 | 64 69 66 66 2d 6e 75 6b |t-keys e|diff-nuk|
|00002270| 65 2d 73 65 6c 65 63 74 | 69 76 65 2d 64 69 73 70 |e-select|ive-disp|
|00002280| 6c 61 79 20 72 75 6e 2d | 68 6f 6f 6b 73 20 65 64 |lay run-|hooks ed|
|00002290| 69 66 66 2d 70 72 65 70 | 61 72 65 2d 62 75 66 66 |iff-prep|are-buff|
|000022a0| 65 72 2d 68 6f 6f 6b 20 | 65 64 69 66 66 2d 74 68 |er-hook |ediff-th|
|000022b0| 69 73 2d 62 75 66 66 65 | 72 2d 65 64 69 66 66 2d |is-buffe|r-ediff-|
|000022c0| 73 65 73 73 69 6f 6e 73 | 20 65 64 69 66 66 2d 6d |sessions| ediff-m|
|000022d0| 61 6b 65 2d 62 75 66 66 | 65 72 73 2d 72 65 61 64 |ake-buff|ers-read|
|000022e0| 6f 6e 6c 79 2d 61 74 2d | 73 74 61 72 74 75 70 20 |only-at-|startup |
|000022f0| 65 64 69 66 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |ediff-di|fference|
|00002300| 2d 76 65 63 74 6f 72 2d | 41 20 65 64 69 66 66 2d |-vector-|A ediff-|
|00002310| 6e 75 6d 62 65 72 2d 6f | 66 2d 64 69 66 66 65 72 |number-o|f-differ|
|00002320| 65 6e 63 65 73 20 2d 31 | 20 65 64 69 66 66 2d 63 |ences -1| ediff-c|
|00002330| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00002340| 65 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 63 75 72 |e ediff-|make-cur|
|00002350| 72 65 6e 74 2d 64 69 66 | 66 2d 6f 76 65 72 6c 61 |rent-dif|f-overla|
|00002360| 79 20 41 20 42 20 43 20 | 41 6e 63 65 73 74 6f 72 |y A B C |Ancestor|
|00002370| 20 65 64 69 66 66 2d 73 | 65 74 75 70 2d 77 69 6e | ediff-s|etup-win|
|00002380| 64 6f 77 73 20 6f 76 65 | 72 6c 20 65 64 69 66 66 |dows ove|rl ediff|
|00002390| 2d 6f 76 65 72 6c 61 79 | 70 20 65 64 69 66 66 2d |-overlay|p ediff-|
|000023a0| 65 6d 61 63 73 2d 70 20 | 6f 76 65 72 6c 61 79 2d |emacs-p |overlay-|
|000023b0| 73 74 61 72 74 20 65 78 | 74 65 6e 74 2d 73 74 61 |start ex|tent-sta|
|000023c0| 72 74 2d 70 6f 73 69 74 | 69 6f 6e 20 73 68 69 66 |rt-posit|ion shif|
|000023d0| 74 2d 43 20 73 68 69 66 | 74 2d 42 20 73 68 69 66 |t-C shif|t-B shif|
|000023e0| 74 2d 41 20 73 65 6c 65 | 63 74 2d 77 69 6e 64 6f |t-A sele|ct-windo|
|000023f0| 77 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 41 |w ediff-|window-A|
|00002400| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 42 20 | ediff-w|indow-B |
|00002410| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 43 20 65 |ediff-wi|ndow-C e|
|00002420| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 77 69 6e |diff-con|trol-win|
|00002430| 64 6f 77 20 65 64 69 66 | 66 2d 76 69 73 69 62 6c |dow edif|f-visibl|
|00002440| 65 2d 72 65 67 69 6f 6e | 20 73 74 61 72 74 75 70 |e-region| startup|
|00002450| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 61 72 72 |-hooks e|diff-arr|
|00002460| 61 6e 67 65 2d 61 75 74 | 6f 73 61 76 65 2d 69 6e |ange-aut|osave-in|
|00002470| 2d 6d 65 72 67 65 2d 6a | 6f 62 73 20 65 64 69 66 |-merge-j|obs edif|
|00002480| 66 2d 72 65 66 72 65 73 | 68 2d 6d 6f 64 65 2d 6c |f-refres|h-mode-l|
|00002490| 69 6e 65 73 20 65 64 69 | 66 66 2d 73 65 73 73 69 |ines edi|ff-sessi|
|000024a0| 6f 6e 2d 72 65 67 69 73 | 74 72 79 20 65 64 69 66 |on-regis|try edif|
|000024b0| 66 2d 75 70 64 61 74 65 | 2d 72 65 67 69 73 74 72 |f-update|-registr|
|000024c0| 79 20 65 64 69 66 66 2d | 6d 65 74 61 2d 62 75 66 |y ediff-|meta-buf|
|000024d0| 66 65 72 20 65 64 69 66 | 66 2d 75 70 64 61 74 65 |fer edif|f-update|
|000024e0| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 65 64 69 |-meta-bu|ffer edi|
|000024f0| 66 66 2d 6d 65 74 61 2d | 73 65 73 73 69 6f 6e 2d |ff-meta-|session-|
|00002500| 6e 75 6d 62 65 72 20 65 | 64 69 66 66 2d 73 74 61 |number e|diff-sta|
|00002510| 72 74 75 70 2d 68 6f 6f | 6b 5d 20 37 5d 29 0a 23 |rtup-hoo|k] 7]).#|
|00002520| 40 33 35 20 53 65 74 20 | 75 70 20 77 69 6e 64 6f |@35 Set |up windo|
|00002530| 77 20 66 6f 72 20 63 6f | 6e 74 72 6f 6c 20 62 75 |w for co|ntrol bu|
|00002540| 66 66 65 72 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |ffer...(|defalias|
|00002550| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 63 6f | 'ediff-|setup-co|
|00002560| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 20 23 5b 28 |ntrol-bu|ffer #[(|
|00002570| 63 74 6c 2d 62 75 66 29 | 20 22 c0 c1 20 21 ab 85 |ctl-buf)| ".. !..|
|00002580| 5c 6e 71 88 aa 84 c3 5c | 6e 21 88 c4 1d c6 20 88 |\nq....\|n!.... .|
|00002590| c7 20 88 0e 08 63 88 c9 | 20 88 ca 20 ac 83 cb 20 |. ...c..| .. ... |
|000025a0| 88 cc 20 88 cd ce 21 88 | cf 20 88 c1 20 16 10 d1 |.. ...!.|. .. ...|
|000025b0| d2 0e 10 0e 13 0e 14 0e | 15 0e 16 d7 20 ad 82 0e |........|.... ...|
|000025c0| 18 0e 19 26 08 16 1a d7 | 20 ab 84 0e 18 ac 83 db |...&....| .......|
|000025d0| 20 88 65 62 88 0e 1c ce | 77 29 87 22 20 5b 77 69 | .eb....|w)." [wi|
|000025e0| 6e 64 6f 77 2d 64 65 64 | 69 63 61 74 65 64 2d 70 |ndow-ded|icated-p|
|000025f0| 20 73 65 6c 65 63 74 65 | 64 2d 77 69 6e 64 6f 77 | selecte|d-window|
|00002600| 20 63 74 6c 2d 62 75 66 | 20 73 77 69 74 63 68 2d | ctl-buf| switch-|
|00002610| 74 6f 2d 62 75 66 66 65 | 72 20 32 20 77 69 6e 64 |to-buffe|r 2 wind|
|00002620| 6f 77 2d 6d 69 6e 2d 68 | 65 69 67 68 74 20 65 72 |ow-min-h|eight er|
|00002630| 61 73 65 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |ase-buff|er ediff|
|00002640| 2d 73 65 74 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |-set-hel|p-messag|
|00002650| 65 20 65 64 69 66 66 2d | 68 65 6c 70 2d 6d 65 73 |e ediff-|help-mes|
|00002660| 73 61 67 65 20 73 68 72 | 69 6e 6b 2d 77 69 6e 64 |sage shr|ink-wind|
|00002670| 6f 77 2d 69 66 2d 6c 61 | 72 67 65 72 2d 74 68 61 |ow-if-la|rger-tha|
|00002680| 6e 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 6d |n-buffer| ediff-m|
|00002690| 75 6c 74 69 66 72 61 6d | 65 2d 73 65 74 75 70 2d |ultifram|e-setup-|
|000026a0| 70 20 65 64 69 66 66 2d | 69 6e 64 65 6e 74 2d 68 |p ediff-|indent-h|
|000026b0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 65 64 69 66 |elp-mess|age edif|
|000026c0| 66 2d 73 65 74 2d 68 65 | 6c 70 2d 6f 76 65 72 6c |f-set-he|lp-overl|
|000026d0| 61 79 73 20 73 65 74 2d | 62 75 66 66 65 72 2d 6d |ays set-|buffer-m|
|000026e0| 6f 64 69 66 69 65 64 2d | 70 20 6e 69 6c 20 65 64 |odified-|p nil ed|
|000026f0| 69 66 66 2d 72 65 66 72 | 65 73 68 2d 6d 6f 64 65 |iff-refr|esh-mode|
|00002700| 2d 6c 69 6e 65 73 20 65 | 64 69 66 66 2d 63 6f 6e |-lines e|diff-con|
|00002710| 74 72 6f 6c 2d 77 69 6e | 64 6f 77 20 66 6f 72 6d |trol-win|dow form|
|00002720| 61 74 20 22 25 53 25 53 | 25 53 25 53 25 53 25 53 |at "%S%S|%S%S%S%S|
|00002730| 25 53 22 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |%S" edif|f-window|
|00002740| 2d 41 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |-A ediff|-window-|
|00002750| 42 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 43 |B ediff-|window-C|
|00002760| 20 65 64 69 66 66 2d 73 | 70 6c 69 74 2d 77 69 6e | ediff-s|plit-win|
|00002770| 64 6f 77 2d 66 75 6e 63 | 74 69 6f 6e 20 65 64 69 |dow-func|tion edi|
|00002780| 66 66 2d 77 69 6e 64 6f | 77 2d 64 69 73 70 6c 61 |ff-windo|w-displa|
|00002790| 79 2d 70 20 65 64 69 66 | 66 2d 6d 75 6c 74 69 66 |y-p edif|f-multif|
|000027a0| 72 61 6d 65 20 65 64 69 | 66 66 2d 77 69 64 65 2d |rame edi|ff-wide-|
|000027b0| 64 69 73 70 6c 61 79 2d | 70 20 65 64 69 66 66 2d |display-|p ediff-|
|000027c0| 77 69 6e 64 6f 77 2d 63 | 6f 6e 66 69 67 2d 73 61 |window-c|onfig-sa|
|000027d0| 76 65 64 20 65 64 69 66 | 66 2d 6d 61 6b 65 2d 62 |ved edif|f-make-b|
|000027e0| 6f 74 74 6f 6d 2d 74 6f | 6f 6c 62 61 72 20 65 64 |ottom-to|olbar ed|
|000027f0| 69 66 66 2d 77 68 69 74 | 65 73 70 61 63 65 5d 20 |iff-whit|espace] |
|00002800| 39 20 28 23 24 20 2e 20 | 39 35 30 38 29 5d 29 0a |9 (#$ . |9508)]).|
|00002810| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00002820| 2d 61 72 72 61 6e 67 65 | 2d 61 75 74 6f 73 61 76 |-arrange|-autosav|
|00002830| 65 2d 69 6e 2d 6d 65 72 | 67 65 2d 6a 6f 62 73 20 |e-in-mer|ge-jobs |
|00002840| 23 5b 28 6d 65 72 67 65 | 2d 62 75 66 66 65 72 2d |#[(merge|-buffer-|
|00002850| 66 69 6c 65 29 20 22 08 | ad d8 09 3b ab 84 c2 13 |file) ".|...;....|
|00002860| 09 14 0c 3b ab a7 0c 11 | 0d ab 97 c6 0d 21 ab 92 |...;....|.....!..|
|00002870| c7 c6 0d 21 21 ab 8b 72 | 0d 71 88 c8 09 21 88 29 |...!!..r|.q...!.)|
|00002880| aa 8b 0e 09 ca 61 ac 85 | cb 0e 0c 21 88 0d ab 98 |.....a..|...!....|
|00002890| c6 0d 21 ab 93 c7 c6 0d | 21 21 ab 8c 72 0d 71 88 |..!.....|!!..r.q.|
|000028a0| c2 16 0d ce cf 21 29 87 | 0e 09 ca 61 ae 84 cb 0e |.....!).|...a....|
|000028b0| 0c 21 87 22 20 5b 65 64 | 69 66 66 2d 6d 65 72 67 |.!." [ed|iff-merg|
|000028c0| 65 2d 6a 6f 62 20 6d 65 | 72 67 65 2d 62 75 66 66 |e-job me|rge-buff|
|000028d0| 65 72 2d 66 69 6c 65 20 | 74 20 65 64 69 66 66 2d |er-file |t ediff-|
|000028e0| 61 75 74 6f 73 74 6f 72 | 65 2d 6d 65 72 67 65 73 |autostor|e-merges|
|000028f0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 73 74 6f | ediff-m|erge-sto|
|00002900| 72 65 2d 66 69 6c 65 20 | 65 64 69 66 66 2d 62 75 |re-file |ediff-bu|
|00002910| 66 66 65 72 2d 43 20 67 | 65 74 2d 62 75 66 66 65 |ffer-C g|et-buffe|
|00002920| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 73 65 |r buffer|-name se|
|00002930| 74 2d 76 69 73 69 74 65 | 64 2d 66 69 6c 65 2d 6e |t-visite|d-file-n|
|00002940| 61 6d 65 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |ame this|-command|
|00002950| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00002960| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|00002970| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 62 75 66 66 |ITAL-BUF|FER buff|
|00002980| 65 72 2d 6f 66 66 65 72 | 2d 73 61 76 65 20 61 75 |er-offer|-save au|
|00002990| 74 6f 2d 73 61 76 65 2d | 6d 6f 64 65 20 31 5d 20 |to-save-|mode 1] |
|000029a0| 33 5d 29 0a 23 40 32 31 | 37 20 52 65 63 6f 6d 70 |3]).#@21|7 Recomp|
|000029b0| 75 74 65 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |ute diff|erence r|
|000029c0| 65 67 69 6f 6e 73 20 69 | 6e 20 62 75 66 66 65 72 |egions i|n buffer|
|000029d0| 73 20 41 2c 20 42 2c 20 | 61 6e 64 20 43 2e 0a 42 |s A, B, |and C..B|
|000029e0| 75 66 66 65 72 73 20 61 | 72 65 20 6e 6f 74 20 73 |uffers a|re not s|
|000029f0| 79 6e 63 68 72 6f 6e 69 | 7a 65 64 20 77 69 74 68 |ynchroni|zed with|
|00002a00| 20 74 68 65 69 72 20 72 | 65 73 70 65 63 74 69 76 | their r|espectiv|
|00002a10| 65 20 66 69 6c 65 73 2c | 20 73 6f 20 63 68 61 6e |e files,| so chan|
|00002a20| 67 65 73 20 64 6f 6e 65 | 0a 74 6f 20 74 68 65 73 |ges done|.to thes|
|00002a30| 65 20 62 75 66 66 65 72 | 73 20 61 72 65 20 6e 6f |e buffer|s are no|
|00002a40| 74 20 73 61 76 65 64 20 | 61 74 20 74 68 69 73 20 |t saved |at this |
|00002a50| 70 6f 69 6e 74 2d 2d 2d | 74 68 65 20 75 73 65 72 |point---|the user|
|00002a60| 20 63 61 6e 20 64 6f 20 | 74 68 69 73 20 6c 61 74 | can do |this lat|
|00002a70| 65 72 2c 0a 69 66 20 6e | 65 63 65 73 73 61 72 79 |er,.if n|ecessary|
|00002a80| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00002a90| 69 66 66 2d 75 70 64 61 | 74 65 2d 64 69 66 66 73 |iff-upda|te-diffs|
|00002aa0| 20 23 5b 6e 69 6c 20 22 | c0 19 c2 09 21 ac 85 c3 | #[nil "|....!...|
|00002ab0| c4 0d 5c 22 88 29 0e 06 | ab 97 c7 0e 06 21 ab 91 |..\".)..|.....!..|
|00002ac0| c8 c7 0e 06 21 21 ab 89 | c9 ca 21 ac 84 c3 cb 21 |....!!..|..!....!|
|00002ad0| 88 0e 0c ab 97 c7 0e 0c | 21 ab 91 c8 c7 0e 0c 21 |........|!......!|
|00002ae0| 21 ab 89 72 0e 0c 71 88 | 60 29 aa 89 0d cd 61 ae |!..r..q.|`)....a.|
|00002af0| 84 c3 0e 0e 21 cf 0e 10 | 21 d1 0e 0c 21 d1 0e 12 |....!...|!...!...|
|00002b00| 21 d1 0e 13 21 0e 14 40 | 0e 14 41 40 d5 0e 14 38 |!...!..@|..A@...8|
|00002b10| c0 89 89 89 89 89 89 89 | 89 1e 16 1e 17 1e 18 1e |........|........|
|00002b20| 19 1e 1a 1e 1b 1e 1c 1e | 1d 1e 1e 1e 1f 1e 20 1e |........|...... .|
|00002b30| 21 1e 5c 22 1e 23 1e 24 | 1e 25 1e 26 0e 24 3b ab |!.\".#.$|.%.&.$;.|
|00002b40| 86 e7 0e 24 21 16 24 0e | 23 3b ab 86 e7 0e 23 21 |...$!.$.|#;....#!|
|00002b50| 16 23 0e 5c 22 3b ab 86 | e7 0e 5c 22 21 16 5c 22 |.#.\";..|..\"!.\"|
|00002b60| e8 e9 21 88 0e 21 1e 2a | eb 0e 2a 21 ad 8e 0e 2c |..!..!.*|..*!...,|
|00002b70| ab 86 ed 0e 2a 21 aa 84 | ee 0e 2a 21 29 16 1e 0e |....*!..|..*!)...|
|00002b80| 20 1e 2a eb 0e 2a 21 ad | 8e 0e 2c ab 86 ed 0e 2a | .*..*!.|..,....*|
|00002b90| 21 aa 84 ee 0e 2a 21 29 | 16 1c 0e 1f 1e 2a eb 0e |!....*!)|.....*..|
|00002ba0| 2a 21 ad 8e 0e 2c ab 86 | ed 0e 2a 21 aa 84 ee 0e |*!...,..|..*!....|
|00002bb0| 2a 21 29 16 1a 0e 21 1e | 2a eb 0e 2a 21 ad 8e 0e |*!)...!.|*..*!...|
|00002bc0| 2c ab 86 ef 0e 2a 21 aa | 84 f0 0e 2a 21 29 16 1d |,....*!.|...*!)..|
|00002bd0| 0e 20 1e 2a eb 0e 2a 21 | ad 8e 0e 2c ab 86 ef 0e |. .*..*!|...,....|
|00002be0| 2a 21 aa 84 f0 0e 2a 21 | 29 16 1b 0e 1f 1e 2a eb |*!....*!|).....*.|
|00002bf0| 0e 2a 21 ad 8e 0e 2c ab | 86 ef 0e 2a 21 aa 84 f0 |.*!...,.|...*!...|
|00002c00| 0e 2a 21 29 16 19 0e 31 | ab bc f2 0e 1e 0e 1d 0e |.*!)...1|........|
|00002c10| 0c 0e 25 24 88 f3 0e 25 | f4 5c 22 16 18 f2 0e 1c |..%$...%|.\".....|
|00002c20| 0e 1b 0e 12 0e 25 24 88 | f3 0e 25 f5 5c 22 16 17 |.....%$.|..%.\"..|
|00002c30| 0e 36 ab b0 f2 0e 1a 0e | 19 0e 13 0e 25 24 88 f3 |.6......|....%$..|
|00002c40| 0e 25 f7 5c 22 16 16 aa | 9c f3 0e 0c 0e 24 5c 22 |.%.\"...|.....$\"|
|00002c50| 16 18 f3 0e 12 0e 23 5c | 22 16 17 0e 36 ab 88 f3 |......#\|"...6...|
|00002c60| 0e 13 0e 5c 22 5c 22 16 | 16 f8 f9 fa 5c 22 88 f8 |...\"\".|....\"..|
|00002c70| fb fa 5c 22 88 f8 fc fa | 5c 22 88 f8 fd fa 5c 22 |..\"....|\"....\"|
|00002c80| 88 c0 16 3d c0 16 06 c0 | 16 3e c0 16 3f 0e 40 0e |...=....|.>..?.@.|
|00002c90| 41 0e 42 0e 43 0e 44 1e | 44 1e 43 1e 42 1e 41 1e |A.B.C.D.|D.C.B.A.|
|00002ca0| 40 0e 42 ab 95 81 45 00 | 16 40 81 46 00 16 41 c0 |@.B...E.|.@.F..A.|
|00002cb0| 16 42 c0 16 43 81 47 00 | 16 44 0e 40 0e 18 0e 17 |.B..C.G.|.D.@....|
|00002cc0| 0e 16 23 88 2d 0e 39 47 | 16 48 81 49 00 0e 18 21 |..#.-.9G|.H.I...!|
|00002cd0| 88 81 49 00 0e 17 21 88 | 0e 16 ab 87 81 49 00 0e |..I...!.|.....I..|
|00002ce0| 16 21 88 0e 36 ab a3 0e | 4a 1e 4b 81 4c 00 1e 4d |.!..6...|J.K.L..M|
|00002cf0| 81 4c 00 0e 48 57 ab 91 | 81 4e 00 0e 4d 0e 4b 5c |.L..HW..|.N..M.K\|
|00002d00| 22 88 0e 4d 54 89 16 4d | aa 6a 2a 81 4f 00 81 50 |"..MT..M|.j*.O..P|
|00002d10| 00 81 51 00 0e 26 5c 22 | 21 88 81 52 00 81 53 00 |..Q..&\"|!..R..S.|
|00002d20| 21 2e 11 87 22 20 5b 6e | 69 6c 20 6d 65 74 61 2d |!..." [n|il meta-|
|00002d30| 62 75 66 2d 70 20 65 64 | 69 66 66 2d 69 6e 2d 63 |buf-p ed|iff-in-c|
|00002d40| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 2d 70 20 |ontrol-b|uffer-p |
|00002d50| 65 72 72 6f 72 20 22 25 | 53 3a 20 54 68 69 73 20 |error "%|S: This |
|00002d60| 63 6f 6d 6d 61 6e 64 20 | 72 75 6e 73 20 69 6e 20 |command |runs in |
|00002d70| 45 64 69 66 66 20 43 6f | 6e 74 72 6f 6c 20 42 75 |Ediff Co|ntrol Bu|
|00002d80| 66 66 65 72 20 6f 6e 6c | 79 21 22 20 74 68 69 73 |ffer onl|y!" this|
|00002d90| 2d 63 6f 6d 6d 61 6e 64 | 20 65 64 69 66 66 2d 61 |-command| ediff-a|
|00002da0| 6e 63 65 73 74 6f 72 2d | 62 75 66 66 65 72 20 67 |ncestor-|buffer g|
|00002db0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00002dc0| 2d 6e 61 6d 65 20 79 2d | 6f 72 2d 6e 2d 70 20 22 |-name y-|or-n-p "|
|00002dd0| 41 6e 63 65 73 74 6f 72 | 20 62 75 66 66 65 72 20 |Ancestor| buffer |
|00002de0| 77 69 6c 6c 20 6e 6f 74 | 20 62 65 20 75 73 65 64 |will not| be used|
|00002df0| 2e 20 52 65 63 6f 6d 70 | 75 74 65 20 64 69 66 66 |. Recomp|ute diff|
|00002e00| 73 20 61 6e 79 77 61 79 | 3f 20 22 20 22 52 65 63 |s anyway|? " "Rec|
|00002e10| 6f 6d 70 75 74 61 74 69 | 6f 6e 20 6f 66 20 64 69 |omputati|on of di|
|00002e20| 66 66 65 72 65 6e 63 65 | 73 20 63 61 6e 63 65 6c |fference|s cancel|
|00002e30| 65 64 22 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |ed" edif|f-buffer|
|00002e40| 2d 41 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 64 |-A ediff|-quit ed|
|00002e50| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|00002e60| 2d 42 55 46 46 45 52 20 | 67 65 74 2d 62 75 66 66 |-BUFFER |get-buff|
|00002e70| 65 72 2d 63 72 65 61 74 | 65 20 65 64 69 66 66 2d |er-creat|e ediff-|
|00002e80| 74 6d 70 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |tmp-buff|er buffe|
|00002e90| 72 2d 66 69 6c 65 2d 6e | 61 6d 65 20 65 64 69 66 |r-file-n|ame edif|
|00002ea0| 66 2d 62 75 66 66 65 72 | 2d 42 20 65 64 69 66 66 |f-buffer|-B ediff|
|00002eb0| 2d 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d |-buffer-|C ediff-|
|00002ec0| 6e 61 72 72 6f 77 2d 62 | 6f 75 6e 64 73 20 32 20 |narrow-b|ounds 2 |
|00002ed0| 66 69 6c 65 2d 43 20 66 | 69 6c 65 2d 42 20 66 69 |file-C f|ile-B fi|
|00002ee0| 6c 65 2d 41 20 65 6e 64 | 2d 43 20 62 65 67 2d 43 |le-A end|-C beg-C|
|00002ef0| 20 65 6e 64 2d 42 20 62 | 65 67 2d 42 20 65 6e 64 | end-B b|eg-B end|
|00002f00| 2d 41 20 62 65 67 2d 41 | 20 6f 76 65 72 6c 2d 43 |-A beg-A| overl-C|
|00002f10| 20 6f 76 65 72 6c 2d 42 | 20 6f 76 65 72 6c 2d 41 | overl-B| overl-A|
|00002f20| 20 62 75 66 2d 43 2d 66 | 69 6c 65 2d 6e 61 6d 65 | buf-C-f|ile-name|
|00002f30| 20 62 75 66 2d 42 2d 66 | 69 6c 65 2d 6e 61 6d 65 | buf-B-f|ile-name|
|00002f40| 20 62 75 66 2d 41 2d 66 | 69 6c 65 2d 6e 61 6d 65 | buf-A-f|ile-name|
|00002f50| 20 74 6d 70 2d 62 75 66 | 66 65 72 20 70 6f 69 6e | tmp-buf|fer poin|
|00002f60| 74 2d 41 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |t-A file|-name-no|
|00002f70| 6e 64 69 72 65 63 74 6f | 72 79 20 65 64 69 66 66 |ndirecto|ry ediff|
|00002f80| 2d 75 6e 73 65 6c 65 63 | 74 2d 61 6e 64 2d 73 65 |-unselec|t-and-se|
|00002f90| 6c 65 63 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |lect-dif|ference |
|00002fa0| 2d 31 20 6f 76 65 72 6c | 20 65 64 69 66 66 2d 6f |-1 overl| ediff-o|
|00002fb0| 76 65 72 6c 61 79 70 20 | 65 64 69 66 66 2d 65 6d |verlayp |ediff-em|
|00002fc0| 61 63 73 2d 70 20 6f 76 | 65 72 6c 61 79 2d 73 74 |acs-p ov|erlay-st|
|00002fd0| 61 72 74 20 65 78 74 65 | 6e 74 2d 73 74 61 72 74 |art exte|nt-start|
|00002fe0| 2d 70 6f 73 69 74 69 6f | 6e 20 6f 76 65 72 6c 61 |-positio|n overla|
|00002ff0| 79 2d 65 6e 64 20 65 78 | 74 65 6e 74 2d 65 6e 64 |y-end ex|tent-end|
|00003000| 2d 70 6f 73 69 74 69 6f | 6e 20 65 64 69 66 66 2d |-positio|n ediff-|
|00003010| 77 6f 72 64 2d 6d 6f 64 | 65 20 65 64 69 66 66 2d |word-mod|e ediff-|
|00003020| 77 6f 72 64 69 66 79 20 | 65 64 69 66 66 2d 6d 61 |wordify |ediff-ma|
|00003030| 6b 65 2d 74 65 6d 70 2d | 66 69 6c 65 20 22 72 65 |ke-temp-|file "re|
|00003040| 67 41 22 20 22 72 65 67 | 42 22 20 65 64 69 66 66 |gA" "reg|B" ediff|
|00003050| 2d 33 77 61 79 2d 6a 6f | 62 20 22 72 65 67 43 22 |-3way-jo|b "regC"|
|00003060| 20 65 64 69 66 66 2d 63 | 6c 65 61 72 2d 64 69 66 | ediff-c|lear-dif|
|00003070| 66 2d 76 65 63 74 6f 72 | 20 65 64 69 66 66 2d 64 |f-vector| ediff-d|
|00003080| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00003090| 2d 41 20 66 69 6e 65 2d | 64 69 66 66 73 2d 61 6c |-A fine-|diffs-al|
|000030a0| 73 6f 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 |so ediff|-differe|
|000030b0| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 42 20 65 64 69 |nce-vect|or-B edi|
|000030c0| 66 66 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 76 65 |ff-diffe|rence-ve|
|000030d0| 63 74 6f 72 2d 43 20 65 | 64 69 66 66 2d 64 69 66 |ctor-C e|diff-dif|
|000030e0| 66 65 72 65 6e 63 65 2d | 76 65 63 74 6f 72 2d 41 |ference-|vector-A|
|000030f0| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 73 74 |ncestor |ediff-st|
|00003100| 61 74 65 2d 6f 66 2d 6d | 65 72 67 65 20 65 64 69 |ate-of-m|erge edi|
|00003110| 66 66 2d 6b 69 6c 6c 65 | 64 2d 64 69 66 66 73 2d |ff-kille|d-diffs-|
|00003120| 61 6c 69 73 74 20 65 64 | 69 66 66 2d 73 65 74 75 |alist ed|iff-setu|
|00003130| 70 2d 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 66 |p-diff-r|egions-f|
|00003140| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 33 77 |unction |ediff-3w|
|00003150| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00003160| 62 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |b ediff-|merge-jo|
|00003170| 62 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |b ediff-|merge-wi|
|00003180| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 6a 6f 62 20 |th-ances|tor-job |
|00003190| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 20 65 |ediff-jo|b-name e|
|000031a0| 64 69 66 66 2d 73 65 74 | 75 70 2d 64 69 66 66 2d |diff-set|up-diff-|
|000031b0| 72 65 67 69 6f 6e 73 33 | 20 74 20 65 64 69 66 66 |regions3| t ediff|
|000031c0| 2d 66 69 6c 65 73 33 20 | 65 64 69 66 66 2d 6e 75 |-files3 |ediff-nu|
|000031d0| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|000031e0| 63 65 73 20 64 65 6c 65 | 74 65 2d 66 69 6c 65 20 |ces dele|te-file |
|000031f0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00003200| 66 66 65 72 20 63 74 6c | 2d 62 75 66 20 30 20 6e |ffer ctl|-buf 0 n|
|00003210| 20 65 64 69 66 66 2d 73 | 65 74 2d 73 74 61 74 65 | ediff-s|et-state|
|00003220| 2d 6f 66 2d 64 69 66 66 | 2d 69 6e 2d 61 6c 6c 2d |-of-diff|-in-all-|
|00003230| 62 75 66 66 65 72 73 20 | 65 64 69 66 66 2d 6a 75 |buffers |ediff-ju|
|00003240| 6d 70 2d 74 6f 2d 64 69 | 66 66 65 72 65 6e 63 65 |mp-to-di|fference|
|00003250| 20 65 64 69 66 66 2d 64 | 69 66 66 2d 61 74 2d 70 | ediff-d|iff-at-p|
|00003260| 6f 69 6e 74 20 41 20 6d | 65 73 73 61 67 65 20 22 |oint A m|essage "|
|00003270| 22 5d 20 31 38 20 28 23 | 24 20 2e 20 31 30 36 36 |"] 18 (#|$ . 1066|
|00003280| 36 29 20 6e 69 6c 5d 29 | 0a 23 40 36 37 20 52 65 |6) nil])|.#@67 Re|
|00003290| 76 65 72 74 20 62 75 66 | 66 65 72 73 20 41 2c 20 |vert buf|fers A, |
|000032a0| 42 20 61 6e 64 20 43 2e | 20 54 68 65 6e 20 72 65 |B and C.| Then re|
|000032b0| 72 75 6e 20 45 64 69 66 | 66 20 6f 6e 20 66 69 6c |run Edif|f on fil|
|000032c0| 65 20 41 20 61 6e 64 20 | 66 69 6c 65 20 42 2e 1f |e A and |file B..|
|000032d0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000032e0| 66 2d 72 65 76 65 72 74 | 2d 62 75 66 66 65 72 73 |f-revert|-buffers|
|000032f0| 2d 74 68 65 6e 2d 72 65 | 63 6f 6d 70 75 74 65 2d |-then-re|compute-|
|00003300| 64 69 66 66 73 20 23 5b | 28 6e 6f 63 6f 6e 66 69 |diffs #[|(noconfi|
|00003310| 72 6d 29 20 22 c0 19 c2 | 09 21 ac 85 c3 c4 0d 5c |rm) "...|.!.....\|
|00003320| 22 88 29 0e 06 0e 07 0e | 08 0e 09 0e 5c 6e 0e 0b |".).....|....\n..|
|00003330| 0e 0c 0e 0d 0e 0e 1e 0f | 1e 10 1e 11 1e 12 1e 13 |........|........|
|00003340| 1e 14 1e 15 1e 16 89 1e | 17 ab 9c d8 0e 17 21 ab |........|......!.|
|00003350| 96 d9 d8 0e 17 21 21 ab | 8e 72 0e 17 71 88 da db |.....!!.|.r..q...|
|00003360| 0e 1c 5c 22 88 29 aa 8a | 0d dd 61 ac 85 c3 0e 1e |..\".)..|..a.....|
|00003370| 21 88 0e 16 ab 9c d8 0e | 16 21 ab 96 d9 d8 0e 16 |!.......|.!......|
|00003380| 21 21 ab 8e 72 0e 16 71 | 88 da db 0e 1c 5c 22 88 |!!..r..q|.....\".|
|00003390| 29 aa 8a 0d dd 61 ac 85 | c3 0e 1e 21 88 0e 0f ab |)....a..|...!....|
|000033a0| aa 0e 15 ab 9c d8 0e 15 | 21 ab 96 d9 d8 0e 15 21 |........|!......!|
|000033b0| 21 ab 8e 72 0e 15 71 88 | da db 0e 1c 5c 22 88 29 |!..r..q.|....\".)|
|000033c0| aa 8a 0d dd 61 ac 85 c3 | 0e 1e 21 88 0e 10 ab a5 |....a...|..!.....|
|000033d0| 0e 14 71 88 df 0e 13 3f | 21 88 e0 0e 15 21 88 0e |..q....?|!....!..|
|000033e0| 11 ab 8a e1 0e 17 0e 16 | 0e 12 23 aa 8a e2 0e 17 |........|..#.....|
|000033f0| 0e 16 5c 22 aa 82 e3 20 | 2e 09 87 22 20 5b 6e 69 |..\"... |..." [ni|
|00003400| 6c 20 6d 65 74 61 2d 62 | 75 66 2d 70 20 65 64 69 |l meta-b|uf-p edi|
|00003410| 66 66 2d 69 6e 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ff-in-co|ntrol-bu|
|00003420| 66 66 65 72 2d 70 20 65 | 72 72 6f 72 20 22 25 53 |ffer-p e|rror "%S|
|00003430| 3a 20 54 68 69 73 20 63 | 6f 6d 6d 61 6e 64 20 72 |: This c|ommand r|
|00003440| 75 6e 73 20 69 6e 20 45 | 64 69 66 66 20 43 6f 6e |uns in E|diff Con|
|00003450| 74 72 6f 6c 20 42 75 66 | 66 65 72 20 6f 6e 6c 79 |trol Buf|fer only|
|00003460| 21 22 20 74 68 69 73 2d | 63 6f 6d 6d 61 6e 64 20 |!" this-|command |
|00003470| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 41 20 65 |ediff-bu|ffer-A e|
|00003480| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 65 64 |diff-buf|fer-B ed|
|00003490| 69 66 66 2d 62 75 66 66 | 65 72 2d 43 20 65 64 69 |iff-buff|er-C edi|
|000034a0| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |ff-contr|ol-buffe|
|000034b0| 72 20 65 64 69 66 66 2d | 6b 65 65 70 2d 76 61 72 |r ediff-|keep-var|
|000034c0| 69 61 6e 74 73 20 65 64 | 69 66 66 2d 61 6e 63 65 |iants ed|iff-ance|
|000034d0| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 65 64 69 66 |stor-buf|fer edif|
|000034e0| 66 2d 6d 65 72 67 65 2d | 77 69 74 68 2d 61 6e 63 |f-merge-|with-anc|
|000034f0| 65 73 74 6f 72 2d 6a 6f | 62 20 65 64 69 66 66 2d |estor-jo|b ediff-|
|00003500| 6d 65 72 67 65 2d 6a 6f | 62 20 65 64 69 66 66 2d |merge-jo|b ediff-|
|00003510| 33 77 61 79 2d 63 6f 6d | 70 61 72 69 73 6f 6e 2d |3way-com|parison-|
|00003520| 6a 6f 62 20 63 6f 6d 70 | 61 72 69 73 6f 6e 20 6d |job comp|arison m|
|00003530| 65 72 67 65 20 61 6e 63 | 65 73 74 6f 72 2d 6a 6f |erge anc|estor-jo|
|00003540| 62 20 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 20 6b |b ancest|or-buf k|
|00003550| 65 65 70 2d 76 61 72 69 | 61 6e 74 73 20 63 74 6c |eep-vari|ants ctl|
|00003560| 2d 62 75 66 20 62 75 66 | 43 20 62 75 66 42 20 62 |-buf buf|C bufB b|
|00003570| 75 66 41 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |ufA get-|buffer b|
|00003580| 75 66 66 65 72 2d 6e 61 | 6d 65 20 72 65 76 65 72 |uffer-na|me rever|
|00003590| 74 2d 62 75 66 66 65 72 | 20 74 20 6e 6f 63 6f 6e |t-buffer| t nocon|
|000035a0| 66 69 72 6d 20 65 64 69 | 66 66 2d 71 75 69 74 20 |firm edi|ff-quit |
|000035b0| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|000035c0| 41 4c 2d 42 55 46 46 45 | 52 20 65 64 69 66 66 2d |AL-BUFFE|R ediff-|
|000035d0| 72 65 61 6c 6c 79 2d 71 | 75 69 74 20 6b 69 6c 6c |really-q|uit kill|
|000035e0| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 6d 65 |-buffer |ediff-me|
|000035f0| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00003600| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00003610| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 65 64 |merge-bu|ffers ed|
|00003620| 69 66 66 2d 75 70 64 61 | 74 65 2d 64 69 66 66 73 |iff-upda|te-diffs|
|00003630| 5d 20 31 30 20 28 23 24 | 20 2e 20 31 32 39 34 32 |] 10 (#$| . 12942|
|00003640| 29 20 22 50 22 5d 29 0a | 23 40 31 31 37 20 42 72 |) "P"]).|#@117 Br|
|00003650| 69 6e 67 20 74 68 65 20 | 68 69 67 68 6c 69 67 68 |ing the |highligh|
|00003660| 74 65 64 20 72 65 67 69 | 6f 6e 20 6f 66 20 61 6c |ted regi|on of al|
|00003670| 6c 20 62 75 66 66 65 72 | 73 20 62 65 69 6e 67 20 |l buffer|s being |
|00003680| 63 6f 6d 70 61 72 65 64 | 20 69 6e 74 6f 20 76 69 |compared| into vi|
|00003690| 65 77 2e 0a 52 65 65 73 | 74 61 62 6c 69 73 68 20 |ew..Rees|tablish |
|000036a0| 74 68 65 20 64 65 66 61 | 75 6c 74 20 74 68 72 65 |the defa|ult thre|
|000036b0| 65 2d 77 69 6e 64 6f 77 | 20 64 69 73 70 6c 61 79 |e-window| display|
|000036c0| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|000036d0| 69 66 66 2d 72 65 63 65 | 6e 74 65 72 20 23 5b 28 |iff-rece|nter #[(|
|000036e0| 26 6f 70 74 69 6f 6e 61 | 6c 20 6e 6f 2d 72 65 68 |&optiona|l no-reh|
|000036f0| 69 67 68 6c 69 67 68 74 | 29 20 22 c0 19 c2 09 21 |ighlight|) "....!|
|00003700| ac 85 c3 c4 0d 5c 22 88 | 29 c0 1e 06 0e 07 ab c3 |.....\".|).......|
|00003710| c8 0e 07 21 ab bd c9 c8 | 0e 07 21 21 ab b5 0e 5c |...!....|..!!...\|
|00003720| 6e ab b1 c8 0e 5c 6e 21 | ab ab c9 c8 0e 5c 6e 21 |n....\n!|.....\n!|
|00003730| 21 ab a3 0e 0b ab 92 0e | 0c ab 9b c8 0e 0c 21 ab |!.......|......!.|
|00003740| 95 c9 c8 0e 0c 21 21 ab | 8d cd 0e 07 0e 5c 6e 0e |.....!!.|.....\n.|
|00003750| 0c 0e 0e 24 88 aa 8d 0d | cf 61 ac 88 d0 0e 11 d2 |...$....|.a......|
|00003760| d3 21 5c 22 88 29 d4 20 | 88 d5 20 ab c3 0d 39 ab |.!\".). |.. ...9.|
|00003770| bf 0e 16 39 ab ba 0d d7 | 73 ac 8e 0d d8 73 ab b0 |...9....|s....s..|
|00003780| d9 da db 0e 16 21 5c 22 | ac a7 dc 0e 1d 21 ab 87 |.....!\"|.....!..|
|00003790| de df 0e 1d 21 21 88 dc | 0e 20 21 ab 87 de df 0e |....!!..|. !.....|
|000037a0| 20 21 21 88 dc 0e 21 21 | ab 87 de df 0e 21 21 21 | !!...!!|.....!!!|
|000037b0| 88 d5 20 ab b0 e2 0e 23 | 21 ab aa 0e 24 ac a6 0e |.. ....#|!...$...|
|000037c0| 23 1e 25 d5 20 ad 96 e2 | 0e 25 21 ad 90 0e 26 ab |#.%. ...|.%!...&.|
|000037d0| 86 e7 0e 25 21 aa 86 e8 | 0e 25 21 e9 61 29 ac 85 |...%!...|.%!.a)..|
|000037e0| de 0e 23 21 88 0e 23 0e | 0e 1e 2a 1e 2b 0e 07 83 |..#!..#.|..*.+...|
|000037f0| a1 01 c8 0e 07 21 83 a1 | 01 c9 c8 0e 07 21 21 83 |.....!..|.....!!.|
|00003800| a1 01 0e 5c 6e 83 a1 01 | c8 0e 5c 6e 21 83 a1 01 |...\n...|..\n!...|
|00003810| c9 c8 0e 5c 6e 21 21 83 | a1 01 0e 0b ab 93 0e 0c |...\n!!.|........|
|00003820| 83 a1 01 c8 0e 0c 21 ab | fd c9 c8 0e 0c 21 21 ab |......!.|.....!!.|
|00003830| f5 0e 2c ac 85 ed 0e 2e | 21 88 ef f0 21 88 ef f1 |..,.....|!...!...|
|00003840| 21 88 0e 0b ab 84 ef f2 | 21 88 0e 2a ab ce c8 0e |!.......|!..*....|
|00003850| 2a 21 ab c8 c9 c8 0e 2a | 21 21 ab c0 72 0e 2a 71 |*!.....*|!!..r.*q|
|00003860| 88 f3 20 88 d5 20 ab b1 | 0e 34 ab ad 0e 24 ac a9 |.. .. ..|.4...$..|
|00003870| 0e 23 1e 25 d5 20 ad 96 | e2 0e 25 21 ad 90 0e 26 |.#.%. ..|..%!...&|
|00003880| ab 86 e7 0e 25 21 aa 86 | e8 0e 25 21 e9 61 29 ac |....%!..|..%!.a).|
|00003890| 88 f5 0e 2b 0d cf 61 5c | 22 88 29 aa 8a 0d cf 61 |...+..a\|".)....a|
|000038a0| ac 85 c3 0e 11 21 88 f6 | 20 88 0e 2a ab 98 c8 0e |.....!..| ..*....|
|000038b0| 2a 21 ab 92 c9 c8 0e 2a | 21 21 ab 8a 72 0e 2a 71 |*!.....*|!!..r.*q|
|000038c0| 88 f7 20 29 aa 89 0d cf | 61 ae 84 c3 0e 11 21 2a |.. )....|a.....!*|
|000038d0| 87 22 20 5b 6e 69 6c 20 | 6d 65 74 61 2d 62 75 66 |." [nil |meta-buf|
|000038e0| 2d 70 20 65 64 69 66 66 | 2d 69 6e 2d 63 6f 6e 74 |-p ediff|-in-cont|
|000038f0| 72 6f 6c 2d 62 75 66 66 | 65 72 2d 70 20 65 72 72 |rol-buff|er-p err|
|00003900| 6f 72 20 22 25 53 3a 20 | 54 68 69 73 20 63 6f 6d |or "%S: |This com|
|00003910| 6d 61 6e 64 20 72 75 6e | 73 20 69 6e 20 45 64 69 |mand run|s in Edi|
|00003920| 66 66 20 43 6f 6e 74 72 | 6f 6c 20 42 75 66 66 65 |ff Contr|ol Buffe|
|00003930| 72 20 6f 6e 6c 79 21 22 | 20 74 68 69 73 2d 63 6f |r only!"| this-co|
|00003940| 6d 6d 61 6e 64 20 62 75 | 66 66 65 72 2d 72 65 61 |mmand bu|ffer-rea|
|00003950| 64 2d 6f 6e 6c 79 20 65 | 64 69 66 66 2d 62 75 66 |d-only e|diff-buf|
|00003960| 66 65 72 2d 41 20 67 65 | 74 2d 62 75 66 66 65 72 |fer-A ge|t-buffer|
|00003970| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 65 64 69 | buffer-|name edi|
|00003980| 66 66 2d 62 75 66 66 65 | 72 2d 42 20 65 64 69 66 |ff-buffe|r-B edif|
|00003990| 66 2d 33 77 61 79 2d 6a | 6f 62 20 65 64 69 66 66 |f-3way-j|ob ediff|
|000039a0| 2d 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d |-buffer-|C ediff-|
|000039b0| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 20 65 64 |setup-wi|ndows ed|
|000039c0| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|000039d0| 65 72 20 65 64 69 66 66 | 2d 71 75 69 74 20 6d 65 |er ediff|-quit me|
|000039e0| 73 73 61 67 65 20 65 64 | 69 66 66 2d 4b 49 4c 4c |ssage ed|iff-KILL|
|000039f0| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|00003a00| 62 65 65 70 20 31 20 65 | 64 69 66 66 2d 76 69 73 |beep 1 e|diff-vis|
|00003a10| 69 62 6c 65 2d 72 65 67 | 69 6f 6e 20 65 64 69 66 |ible-reg|ion edif|
|00003a20| 66 2d 77 69 6e 64 6f 77 | 2d 64 69 73 70 6c 61 79 |f-window|-display|
|00003a30| 2d 70 20 6c 61 73 74 2d | 63 6f 6d 6d 61 6e 64 20 |-p last-|command |
|00003a40| 28 65 64 69 66 66 2d 72 | 65 63 65 6e 74 65 72 20 |(ediff-r|ecenter |
|00003a50| 65 64 69 66 66 2d 64 69 | 72 2d 61 63 74 69 6f 6e |ediff-di|r-action|
|00003a60| 20 65 64 69 66 66 2d 72 | 65 67 69 73 74 72 79 2d | ediff-r|egistry-|
|00003a70| 61 63 74 69 6f 6e 20 65 | 64 69 66 66 2d 70 61 74 |action e|diff-pat|
|00003a80| 63 68 2d 61 63 74 69 6f | 6e 20 65 64 69 66 66 2d |ch-actio|n ediff-|
|00003a90| 74 6f 67 67 6c 65 2d 77 | 69 64 65 2d 64 69 73 70 |toggle-w|ide-disp|
|00003aa0| 6c 61 79 20 65 64 69 66 | 66 2d 74 6f 67 67 6c 65 |lay edif|f-toggle|
|00003ab0| 2d 6d 75 6c 74 69 66 72 | 61 6d 65 29 20 28 65 64 |-multifr|ame) (ed|
|00003ac0| 69 66 66 2d 6e 65 78 74 | 2d 64 69 66 66 65 72 65 |iff-next|-differe|
|00003ad0| 6e 63 65 20 65 64 69 66 | 66 2d 70 72 65 76 69 6f |nce edif|f-previo|
|00003ae0| 75 73 2d 64 69 66 66 65 | 72 65 6e 63 65 20 65 64 |us-diffe|rence ed|
|00003af0| 69 66 66 2d 6a 75 6d 70 | 2d 74 6f 2d 64 69 66 66 |iff-jump|-to-diff|
|00003b00| 65 72 65 6e 63 65 20 65 | 64 69 66 66 2d 6a 75 6d |erence e|diff-jum|
|00003b10| 70 2d 74 6f 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |p-to-dif|ference-|
|00003b20| 61 74 2d 70 6f 69 6e 74 | 29 20 73 74 72 69 6e 67 |at-point|) string|
|00003b30| 2d 6d 61 74 63 68 20 22 | 5e 65 64 69 66 66 2d 22 |-match "|^ediff-"|
|00003b40| 20 73 79 6d 62 6f 6c 2d | 6e 61 6d 65 20 77 69 6e | symbol-|name win|
|00003b50| 64 6f 77 2d 6c 69 76 65 | 2d 70 20 65 64 69 66 66 |dow-live|-p ediff|
|00003b60| 2d 77 69 6e 64 6f 77 2d | 41 20 72 61 69 73 65 2d |-window-|A raise-|
|00003b70| 66 72 61 6d 65 20 77 69 | 6e 64 6f 77 2d 66 72 61 |frame wi|ndow-fra|
|00003b80| 6d 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |me ediff|-window-|
|00003b90| 42 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 43 |B ediff-|window-C|
|00003ba0| 20 66 72 61 6d 65 2d 6c | 69 76 65 2d 70 20 65 64 | frame-l|ive-p ed|
|00003bb0| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |iff-cont|rol-fram|
|00003bc0| 65 20 65 64 69 66 66 2d | 75 73 65 2d 6c 6f 6e 67 |e ediff-|use-long|
|00003bd0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 66 72 |-help-me|ssage fr|
|00003be0| 61 6d 65 20 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |ame edif|f-xemacs|
|00003bf0| 2d 70 20 66 72 61 6d 65 | 2d 69 63 6f 6e 69 66 69 |-p frame|-iconifi|
|00003c00| 65 64 2d 70 20 66 72 61 | 6d 65 2d 76 69 73 69 62 |ed-p fra|me-visib|
|00003c10| 6c 65 2d 70 20 69 63 6f | 6e 20 63 6f 6e 74 72 6f |le-p ico|n contro|
|00003c20| 6c 2d 62 75 66 20 63 6f | 6e 74 72 6f 6c 2d 66 72 |l-buf co|ntrol-fr|
|00003c30| 61 6d 65 20 6e 6f 2d 72 | 65 68 69 67 68 6c 69 67 |ame no-r|ehighlig|
|00003c40| 68 74 20 65 64 69 66 66 | 2d 73 65 6c 65 63 74 2d |ht ediff|-select-|
|00003c50| 64 69 66 66 65 72 65 6e | 63 65 20 65 64 69 66 66 |differen|ce ediff|
|00003c60| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 65 72 65 |-current|-differe|
|00003c70| 6e 63 65 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |nce edif|f-recent|
|00003c80| 65 72 2d 6f 6e 65 2d 77 | 69 6e 64 6f 77 20 41 20 |er-one-w|indow A |
|00003c90| 42 20 43 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |B C edif|f-recent|
|00003ca0| 65 72 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |er-ances|tor edif|
|00003cb0| 66 2d 6d 75 6c 74 69 66 | 72 61 6d 65 20 65 64 69 |f-multif|rame edi|
|00003cc0| 66 66 2d 72 65 73 65 74 | 2d 6d 6f 75 73 65 20 65 |ff-reset|-mouse e|
|00003cd0| 64 69 66 66 2d 72 65 73 | 74 6f 72 65 2d 68 69 67 |diff-res|tore-hig|
|00003ce0| 68 6c 69 67 68 74 69 6e | 67 20 65 64 69 66 66 2d |hlightin|g ediff-|
|00003cf0| 72 65 66 72 65 73 68 2d | 6d 6f 64 65 2d 6c 69 6e |refresh-|mode-lin|
|00003d00| 65 73 5d 20 35 20 28 23 | 24 20 2e 20 31 33 39 30 |es] 5 (#|$ . 1390|
|00003d10| 32 29 20 6e 69 6c 5d 29 | 0a 28 64 65 66 61 6c 69 |2) nil])|.(defali|
|00003d20| 61 73 20 27 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |as 'edif|f-recent|
|00003d30| 65 72 2d 6f 6e 65 2d 77 | 69 6e 64 6f 77 20 23 5b |er-one-w|indow #[|
|00003d40| 28 62 75 66 2d 74 79 70 | 65 29 20 22 c0 19 5c 6e |(buf-typ|e) "..\n|
|00003d50| 89 11 c3 59 ad 83 09 0c | 57 29 85 b1 00 c5 20 1e |...Y....|W).... .|
|00003d60| 06 0e 07 c8 61 ab 85 0e | 09 40 aa 96 0e 07 ca 61 |....a...|.@.....a|
|00003d70| ab 86 0e 09 41 40 aa 8a | 0e 07 cb 61 ad 84 cc 0e |....A@..|...a....|
|00003d80| 09 38 1e 0d ce 0e 0d 21 | ad 8e 0e 0f ab 86 d0 0e |.8.....!|........|
|00003d90| 0d 21 aa 84 d1 0e 0d 21 | 29 1e 12 0e 13 1e 14 0e |.!.....!|).......|
|00003da0| 15 1e 16 0e 07 0e 17 1e | 18 1e 07 d9 0e 07 0e 18 |........|........|
|00003db0| 5c 22 41 2a 1e 1a db 0e | 1a 4a 21 ad 83 0e 1a 4a |\"A*....|.J!....J|
|00003dc0| 89 1e 1c ab 8b 0e 1d ab | 87 de 0e 1c 0e 12 5c 22 |........|......\"|
|00003dd0| 88 0e 1c ab a5 df 0e 1c | 21 88 e0 20 88 e1 e2 0e |........|!.. ....|
|00003de0| 07 e3 c0 0e 16 24 e2 0e | 07 e4 c0 0e 16 24 e2 0e |.....$..|.....$..|
|00003df0| 07 e3 c0 0e 16 24 0e 14 | 24 88 df 0e 06 21 2e 06 |.....$..|$....!..|
|00003e00| 87 22 20 5b 6e 69 6c 20 | 6e 20 65 64 69 66 66 2d |." [nil |n ediff-|
|00003e10| 63 75 72 72 65 6e 74 2d | 64 69 66 66 65 72 65 6e |current-|differen|
|00003e20| 63 65 20 30 20 65 64 69 | 66 66 2d 6e 75 6d 62 65 |ce 0 edi|ff-numbe|
|00003e30| 72 2d 6f 66 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |r-of-dif|ferences|
|00003e40| 20 73 65 6c 65 63 74 65 | 64 2d 77 69 6e 64 6f 77 | selecte|d-window|
|00003e50| 20 63 74 6c 2d 77 69 6e | 64 20 62 75 66 2d 74 79 | ctl-win|d buf-ty|
|00003e60| 70 65 20 41 20 65 64 69 | 66 66 2d 6e 61 72 72 6f |pe A edi|ff-narro|
|00003e70| 77 2d 62 6f 75 6e 64 73 | 20 42 20 43 20 32 20 6f |w-bounds| B C 2 o|
|00003e80| 76 65 72 6c 20 65 64 69 | 66 66 2d 6f 76 65 72 6c |verl edi|ff-overl|
|00003e90| 61 79 70 20 65 64 69 66 | 66 2d 65 6d 61 63 73 2d |ayp edif|f-emacs-|
|00003ea0| 70 20 6f 76 65 72 6c 61 | 79 2d 73 74 61 72 74 20 |p overla|y-start |
|00003eb0| 65 78 74 65 6e 74 2d 73 | 74 61 72 74 2d 70 6f 73 |extent-s|tart-pos|
|00003ec0| 69 74 69 6f 6e 20 73 68 | 69 66 74 20 65 64 69 66 |ition sh|ift edif|
|00003ed0| 66 2d 6a 6f 62 2d 6e 61 | 6d 65 20 6a 6f 62 2d 6e |f-job-na|me job-n|
|00003ee0| 61 6d 65 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |ame edif|f-contro|
|00003ef0| 6c 2d 62 75 66 66 65 72 | 20 63 6f 6e 74 72 6f 6c |l-buffer| control|
|00003f00| 2d 62 75 66 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |-buf edi|ff-windo|
|00003f10| 77 2d 61 6c 69 73 74 20 | 61 6c 69 73 74 20 61 73 |w-alist |alist as|
|00003f20| 73 6f 63 20 77 69 6e 64 | 6f 77 2d 6e 61 6d 65 20 |soc wind|ow-name |
|00003f30| 77 69 6e 64 6f 77 2d 6c | 69 76 65 2d 70 20 77 69 |window-l|ive-p wi|
|00003f40| 6e 64 6f 77 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |ndow edi|ff-windo|
|00003f50| 77 73 2d 6a 6f 62 20 73 | 65 74 2d 77 69 6e 64 6f |ws-job s|et-windo|
|00003f60| 77 2d 73 74 61 72 74 20 | 73 65 6c 65 63 74 2d 77 |w-start |select-w|
|00003f70| 69 6e 64 6f 77 20 65 64 | 69 66 66 2d 64 65 61 63 |indow ed|iff-deac|
|00003f80| 74 69 76 61 74 65 2d 6d | 61 72 6b 20 65 64 69 66 |tivate-m|ark edif|
|00003f90| 66 2d 70 6f 73 69 74 69 | 6f 6e 2d 72 65 67 69 6f |f-positi|on-regio|
|00003fa0| 6e 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |n ediff-|get-diff|
|00003fb0| 2d 70 6f 73 6e 20 62 65 | 67 20 65 6e 64 5d 20 39 |-posn be|g end] 9|
|00003fc0| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00003fd0| 69 66 66 2d 72 65 63 65 | 6e 74 65 72 2d 61 6e 63 |iff-rece|nter-anc|
|00003fe0| 65 73 74 6f 72 20 23 5b | 6e 69 6c 20 22 08 ad ff |estor #[|nil "...|
|00003ff0| c1 08 21 ad fa c2 c1 08 | 21 21 ad f3 c3 1c 0d 89 |..!.....|!!......|
|00004000| 14 c6 59 ad 84 0c 0e 07 | 57 29 ad e3 c8 08 21 c9 |..Y.....|W)....!.|
|00004010| 20 0e 5c 6e 0e 0b 1e 0c | 1e 0d 1e 0e 1e 0f 08 ab | .\n....|........|
|00004020| bf c1 08 21 ab ba c2 c1 | 08 21 21 ab b3 72 08 71 |...!....|.!!..r.q|
|00004030| 88 d0 d1 d2 c3 0e 0c 24 | 62 88 0e 0f ab 9f d3 0e |.......$|b.......|
|00004040| 0f 21 88 d4 d0 d1 d2 c3 | 0e 0c 24 d0 d1 d5 c3 0e |.!......|..$.....|
|00004050| 0c 24 d0 d1 d2 c3 0e 0c | 24 0e 0d 24 88 29 aa 8b |.$......|$..$.)..|
|00004060| 0e 16 d7 61 ac 85 d8 0e | 19 21 88 d3 0e 0e 21 2c |...a....|.!....!,|
|00004070| 87 22 20 5b 65 64 69 66 | 66 2d 61 6e 63 65 73 74 |." [edif|f-ancest|
|00004080| 6f 72 2d 62 75 66 66 65 | 72 20 67 65 74 2d 62 75 |or-buffe|r get-bu|
|00004090| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|000040a0| 20 6e 69 6c 20 6e 20 65 | 64 69 66 66 2d 63 75 72 | nil n e|diff-cur|
|000040b0| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|000040c0| 30 20 65 64 69 66 66 2d | 6e 75 6d 62 65 72 2d 6f |0 ediff-|number-o|
|000040d0| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 73 20 65 64 |f-differ|ences ed|
|000040e0| 69 66 66 2d 67 65 74 2d | 76 69 73 69 62 6c 65 2d |iff-get-|visible-|
|000040f0| 62 75 66 66 65 72 2d 77 | 69 6e 64 6f 77 20 73 65 |buffer-w|indow se|
|00004100| 6c 65 63 74 65 64 2d 77 | 69 6e 64 6f 77 20 65 64 |lected-w|indow ed|
|00004110| 69 66 66 2d 6a 6f 62 2d | 6e 61 6d 65 20 65 64 69 |iff-job-|name edi|
|00004120| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |ff-contr|ol-buffe|
|00004130| 72 20 63 74 6c 2d 62 75 | 66 20 6a 6f 62 2d 6e 61 |r ctl-bu|f job-na|
|00004140| 6d 65 20 63 74 6c 2d 77 | 69 6e 64 20 77 69 6e 64 |me ctl-w|ind wind|
|00004150| 6f 77 20 65 64 69 66 66 | 2d 67 65 74 2d 64 69 66 |ow ediff|-get-dif|
|00004160| 66 2d 70 6f 73 6e 20 41 | 6e 63 65 73 74 6f 72 20 |f-posn A|ncestor |
|00004170| 62 65 67 20 73 65 6c 65 | 63 74 2d 77 69 6e 64 6f |beg sele|ct-windo|
|00004180| 77 20 65 64 69 66 66 2d | 70 6f 73 69 74 69 6f 6e |w ediff-|position|
|00004190| 2d 72 65 67 69 6f 6e 20 | 65 6e 64 20 74 68 69 73 |-region |end this|
|000041a0| 2d 63 6f 6d 6d 61 6e 64 | 20 65 64 69 66 66 2d 71 |-command| ediff-q|
|000041b0| 75 69 74 20 65 72 72 6f | 72 20 65 64 69 66 66 2d |uit erro|r ediff-|
|000041c0| 4b 49 4c 4c 45 44 2d 56 | 49 54 41 4c 2d 42 55 46 |KILLED-V|ITAL-BUF|
|000041d0| 46 45 52 5d 20 39 5d 29 | 0a 23 40 31 30 32 20 54 |FER] 9])|.#@102 T|
|000041e0| 6f 67 67 6c 65 20 76 65 | 72 74 69 63 61 6c 2f 68 |oggle ve|rtical/h|
|000041f0| 6f 72 69 7a 6f 6e 74 61 | 6c 20 77 69 6e 64 6f 77 |orizonta|l window|
|00004200| 20 73 70 6c 69 74 2e 20 | 0a 44 6f 65 73 20 6e 6f | split. |.Does no|
|00004210| 74 68 69 6e 67 20 69 66 | 20 66 69 6c 65 2d 41 20 |thing if| file-A |
|00004220| 61 6e 64 20 66 69 6c 65 | 2d 42 20 61 72 65 20 69 |and file|-B are i|
|00004230| 6e 20 64 69 66 66 65 72 | 65 6e 74 20 66 72 61 6d |n differ|ent fram|
|00004240| 65 73 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |es...(de|falias '|
|00004250| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 73 70 6c |ediff-to|ggle-spl|
|00004260| 69 74 20 23 5b 6e 69 6c | 20 22 c0 19 c2 09 21 ac |it #[nil| "....!.|
|00004270| 85 c3 c4 0d 5c 22 88 29 | c6 0e 07 21 ad 82 0e 07 |....\".)|...!....|
|00004280| 1e 08 c6 0e 09 21 ad 82 | 0e 09 1e 5c 6e c6 0e 0b |.....!..|...\n...|
|00004290| 21 ad 82 0e 0b 1e 0c 0e | 08 ad 84 cd 0e 08 21 1e |!.......|......!.|
|000042a0| 0e 0e 5c 6e ad 84 cd 0e | 5c 6e 21 1e 0f 0e 0c ad |..\n....|\n!.....|
|000042b0| 84 cd 0e 0c 21 1e 10 0e | 0e 0e 0f 61 ac a4 d1 0e |....!...|...a....|
|000042c0| 0e 21 ab 9e d1 0e 0f 21 | ab 98 0e 12 ab a2 d1 0e |.!.....!|........|
|000042d0| 10 21 ab 8e 0e 0e 0e 10 | 61 ac 87 0e 0f 0e 10 61 |.!......|a......a|
|000042e0| ab 8e 0e 13 d4 61 ab 83 | d5 aa 81 d4 16 13 aa 84 |.....a..|........|
|000042f0| d6 d7 21 88 d8 d9 21 2e | 06 87 22 20 5b 6e 69 6c |..!...!.|.." [nil|
|00004300| 20 6d 65 74 61 2d 62 75 | 66 2d 70 20 65 64 69 66 | meta-bu|f-p edif|
|00004310| 66 2d 69 6e 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |f-in-con|trol-buf|
|00004320| 66 65 72 2d 70 20 65 72 | 72 6f 72 20 22 25 53 3a |fer-p er|ror "%S:|
|00004330| 20 54 68 69 73 20 63 6f | 6d 6d 61 6e 64 20 72 75 | This co|mmand ru|
|00004340| 6e 73 20 69 6e 20 45 64 | 69 66 66 20 43 6f 6e 74 |ns in Ed|iff Cont|
|00004350| 72 6f 6c 20 42 75 66 66 | 65 72 20 6f 6e 6c 79 21 |rol Buff|er only!|
|00004360| 22 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 77 |" this-c|ommand w|
|00004370| 69 6e 64 6f 77 2d 6c 69 | 76 65 2d 70 20 65 64 69 |indow-li|ve-p edi|
|00004380| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 77 69 6e 64 |ff-windo|w-A wind|
|00004390| 2d 41 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |-A ediff|-window-|
|000043a0| 42 20 77 69 6e 64 2d 42 | 20 65 64 69 66 66 2d 77 |B wind-B| ediff-w|
|000043b0| 69 6e 64 6f 77 2d 43 20 | 77 69 6e 64 2d 43 20 77 |indow-C |wind-C w|
|000043c0| 69 6e 64 6f 77 2d 66 72 | 61 6d 65 20 66 72 61 6d |indow-fr|ame fram|
|000043d0| 65 2d 41 20 66 72 61 6d | 65 2d 42 20 66 72 61 6d |e-A fram|e-B fram|
|000043e0| 65 2d 43 20 66 72 61 6d | 65 2d 6c 69 76 65 2d 70 |e-C fram|e-live-p|
|000043f0| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 63 6f 6d 70 | ediff-3|way-comp|
|00004400| 61 72 69 73 6f 6e 2d 6a | 6f 62 20 65 64 69 66 66 |arison-j|ob ediff|
|00004410| 2d 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 66 75 |-split-w|indow-fu|
|00004420| 6e 63 74 69 6f 6e 20 73 | 70 6c 69 74 2d 77 69 6e |nction s|plit-win|
|00004430| 64 6f 77 2d 76 65 72 74 | 69 63 61 6c 6c 79 20 73 |dow-vert|ically s|
|00004440| 70 6c 69 74 2d 77 69 6e | 64 6f 77 2d 68 6f 72 69 |plit-win|dow-hori|
|00004450| 7a 6f 6e 74 61 6c 6c 79 | 20 6d 65 73 73 61 67 65 |zontally| message|
|00004460| 20 22 42 75 66 66 65 72 | 73 20 62 65 69 6e 67 20 | "Buffer|s being |
|00004470| 63 6f 6d 70 61 72 65 64 | 20 61 72 65 20 69 6e 20 |compared| are in |
|00004480| 64 69 66 66 65 72 65 6e | 74 20 66 72 61 6d 65 73 |differen|t frames|
|00004490| 22 20 65 64 69 66 66 2d | 72 65 63 65 6e 74 65 72 |" ediff-|recenter|
|000044a0| 20 6e 6f 2d 72 65 68 69 | 67 68 6c 69 67 68 74 5d | no-rehi|ghlight]|
|000044b0| 20 33 20 28 23 24 20 2e | 20 31 36 38 36 33 29 20 | 3 (#$ .| 16863) |
|000044c0| 6e 69 6c 5d 29 0a 23 40 | 31 35 34 20 53 77 69 74 |nil]).#@|154 Swit|
|000044d0| 63 68 20 62 65 74 77 65 | 65 6e 20 68 69 67 68 6c |ch betwe|en highl|
|000044e0| 69 67 68 74 69 6e 67 20 | 75 73 69 6e 67 20 41 53 |ighting |using AS|
|000044f0| 43 49 49 20 66 6c 61 67 | 73 20 61 6e 64 20 68 69 |CII flag|s and hi|
|00004500| 67 68 6c 69 67 68 74 69 | 6e 67 20 75 73 69 6e 67 |ghlighti|ng using|
|00004510| 20 66 61 63 65 73 2e 0a | 4f 6e 20 61 20 64 75 6d | faces..|On a dum|
|00004520| 62 20 74 65 72 6d 69 6e | 61 6c 2c 20 73 77 69 74 |b termin|al, swit|
|00004530| 63 68 65 73 20 62 65 74 | 77 65 65 6e 20 41 53 43 |ches bet|ween ASC|
|00004540| 49 49 20 68 69 67 68 6c | 69 67 68 74 69 6e 67 20 |II highl|ighting |
|00004550| 61 6e 64 20 6e 6f 20 68 | 69 67 68 6c 69 67 68 74 |and no h|ighlight|
|00004560| 69 6e 67 2e 1f 0a 28 64 | 65 66 61 6c 69 61 73 20 |ing...(d|efalias |
|00004570| 27 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 68 69 |'ediff-t|oggle-hi|
|00004580| 6c 69 74 20 23 5b 6e 69 | 6c 20 22 c0 19 c2 09 21 |lit #[ni|l "....!|
|00004590| ac 85 c3 c4 0d 5c 22 88 | 29 c6 20 ac 9b 0e 07 c8 |.....\".|). .....|
|000045a0| 61 ab 8f c9 ca 21 88 cb | 0e 0c cd 5c 22 88 ce 89 |a....!..|...\"...|
|000045b0| 16 07 87 cb 0e 0c cf 5c | 22 87 cb 0e 0c cd 5c 22 |.......\|".....\"|
|000045c0| 88 0e 10 ab 8d 0e 11 ab | 89 c9 d2 21 88 c0 16 11 |........|...!....|
|000045d0| aa 97 0e 10 ab 89 c9 d3 | 21 88 c0 16 10 aa 8a c9 |........|!.......|
|000045e0| d4 21 88 d5 16 10 d5 16 | 11 0e 10 ab 89 0e 11 ab |.!......|........|
|000045f0| 85 d6 20 88 aa 84 d6 d7 | 21 88 cb 0e 0c cf 5c 22 |.. .....|!.....\"|
|00004600| 87 22 20 5b 6e 69 6c 20 | 6d 65 74 61 2d 62 75 66 |." [nil |meta-buf|
|00004610| 2d 70 20 65 64 69 66 66 | 2d 69 6e 2d 63 6f 6e 74 |-p ediff|-in-cont|
|00004620| 72 6f 6c 2d 62 75 66 66 | 65 72 2d 70 20 65 72 72 |rol-buff|er-p err|
|00004630| 6f 72 20 22 25 53 3a 20 | 54 68 69 73 20 63 6f 6d |or "%S: |This com|
|00004640| 6d 61 6e 64 20 72 75 6e | 73 20 69 6e 20 45 64 69 |mand run|s in Edi|
|00004650| 66 66 20 43 6f 6e 74 72 | 6f 6c 20 42 75 66 66 65 |ff Contr|ol Buffe|
|00004660| 72 20 6f 6e 6c 79 21 22 | 20 74 68 69 73 2d 63 6f |r only!"| this-co|
|00004670| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 68 61 73 2d |mmand ed|iff-has-|
|00004680| 66 61 63 65 2d 73 75 70 | 70 6f 72 74 2d 70 20 65 |face-sup|port-p e|
|00004690| 64 69 66 66 2d 68 69 67 | 68 6c 69 67 68 74 69 6e |diff-hig|hlightin|
|000046a0| 67 2d 73 74 79 6c 65 20 | 61 73 63 69 69 20 6d 65 |g-style |ascii me|
|000046b0| 73 73 61 67 65 20 22 41 | 53 43 49 49 20 68 69 67 |ssage "A|SCII hig|
|000046c0| 68 6c 69 67 68 74 69 6e | 67 20 66 6c 61 67 73 20 |hlightin|g flags |
|000046d0| 72 65 6d 6f 76 65 64 22 | 20 65 64 69 66 66 2d 75 |removed"| ediff-u|
|000046e0| 6e 73 65 6c 65 63 74 2d | 61 6e 64 2d 73 65 6c 65 |nselect-|and-sele|
|000046f0| 63 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 65 64 |ct-diffe|rence ed|
|00004700| 69 66 66 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |iff-curr|ent-diff|
|00004710| 65 72 65 6e 63 65 20 75 | 6e 73 65 6c 65 63 74 2d |erence u|nselect-|
|00004720| 6f 6e 6c 79 20 6f 66 66 | 20 73 65 6c 65 63 74 2d |only off| select-|
|00004730| 6f 6e 6c 79 20 65 64 69 | 66 66 2d 75 73 65 2d 66 |only edi|ff-use-f|
|00004740| 61 63 65 73 20 65 64 69 | 66 66 2d 68 69 67 68 6c |aces edi|ff-highl|
|00004750| 69 67 68 74 2d 61 6c 6c | 2d 64 69 66 66 73 20 22 |ight-all|-diffs "|
|00004760| 55 6e 68 69 67 68 6c 69 | 67 68 74 69 6e 67 20 75 |Unhighli|ghting u|
|00004770| 6e 73 65 6c 65 63 74 65 | 64 20 64 69 66 66 65 72 |nselecte|d differ|
|00004780| 65 6e 63 65 20 72 65 67 | 69 6f 6e 73 22 20 22 48 |ence reg|ions" "H|
|00004790| 69 67 68 6c 69 67 68 74 | 69 6e 67 20 77 69 74 68 |ighlight|ing with|
|000047a0| 20 41 53 43 49 49 20 66 | 6c 61 67 73 22 20 22 52 | ASCII f|lags" "R|
|000047b0| 65 2d 68 69 67 68 6c 69 | 67 68 74 69 6e 67 20 61 |e-highli|ghting a|
|000047c0| 6c 6c 20 64 69 66 66 65 | 72 65 6e 63 65 20 72 65 |ll diffe|rence re|
|000047d0| 67 69 6f 6e 73 22 20 74 | 20 65 64 69 66 66 2d 70 |gions" t| ediff-p|
|000047e0| 61 69 6e 74 2d 62 61 63 | 6b 67 72 6f 75 6e 64 2d |aint-bac|kground-|
|000047f0| 72 65 67 69 6f 6e 73 20 | 75 6e 68 69 67 68 6c 69 |regions |unhighli|
|00004800| 67 68 74 5d 20 33 20 28 | 23 24 20 2e 20 31 37 36 |ght] 3 (|#$ . 176|
|00004810| 31 32 29 20 6e 69 6c 5d | 29 0a 23 40 32 36 20 54 |12) nil]|).#@26 T|
|00004820| 6f 67 67 6c 65 20 61 75 | 74 6f 2d 72 65 66 69 6e |oggle au|to-refin|
|00004830| 65 20 6d 6f 64 65 2e 1f | 0a 28 64 65 66 61 6c 69 |e mode..|.(defali|
|00004840| 61 73 20 27 65 64 69 66 | 66 2d 74 6f 67 67 6c 65 |as 'edif|f-toggle|
|00004850| 2d 61 75 74 6f 72 65 66 | 69 6e 65 20 23 5b 6e 69 |-autoref|ine #[ni|
|00004860| 6c 20 22 c0 19 c2 09 21 | ac 85 c3 c4 0d 5c 22 88 |l "....!|.....\".|
|00004870| 29 0e 06 ab 84 c3 c7 21 | 88 0e 08 c9 61 ab 8d ca |)......!|....a...|
|00004880| 16 08 cb 0e 0c cd 5c 22 | 88 ce cf 21 87 0e 08 ca |......\"|...!....|
|00004890| 61 ab 89 ce d0 21 88 d1 | 89 16 08 87 d2 0e 0c d3 |a....!..|........|
|000048a0| 5c 22 88 ce d4 21 88 c9 | 89 16 08 87 22 20 5b 6e |\"...!..|...." [n|
|000048b0| 69 6c 20 6d 65 74 61 2d | 62 75 66 2d 70 20 65 64 |il meta-|buf-p ed|
|000048c0| 69 66 66 2d 69 6e 2d 63 | 6f 6e 74 72 6f 6c 2d 62 |iff-in-c|ontrol-b|
|000048d0| 75 66 66 65 72 2d 70 20 | 65 72 72 6f 72 20 22 25 |uffer-p |error "%|
|000048e0| 53 3a 20 54 68 69 73 20 | 63 6f 6d 6d 61 6e 64 20 |S: This |command |
|000048f0| 72 75 6e 73 20 69 6e 20 | 45 64 69 66 66 20 43 6f |runs in |Ediff Co|
|00004900| 6e 74 72 6f 6c 20 42 75 | 66 66 65 72 20 6f 6e 6c |ntrol Bu|ffer onl|
|00004910| 79 21 22 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |y!" this|-command|
|00004920| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 6d 6f 64 65 | ediff-w|ord-mode|
|00004930| 20 22 4e 6f 20 66 69 6e | 65 20 64 69 66 66 65 72 | "No fin|e differ|
|00004940| 65 6e 63 65 73 20 69 6e | 20 74 68 69 73 20 6d 6f |ences in| this mo|
|00004950| 64 65 22 20 65 64 69 66 | 66 2d 61 75 74 6f 2d 72 |de" edif|f-auto-r|
|00004960| 65 66 69 6e 65 20 6e 69 | 78 20 6f 6e 20 65 64 69 |efine ni|x on edi|
|00004970| 66 66 2d 6d 61 6b 65 2d | 66 69 6e 65 2d 64 69 66 |ff-make-|fine-dif|
|00004980| 66 73 20 65 64 69 66 66 | 2d 63 75 72 72 65 6e 74 |fs ediff|-current|
|00004990| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 6e 6f 66 6f |-differe|nce nofo|
|000049a0| 72 63 65 20 6d 65 73 73 | 61 67 65 20 22 41 75 74 |rce mess|age "Aut|
|000049b0| 6f 2d 72 65 66 69 6e 69 | 6e 67 20 69 73 20 4f 4e |o-refini|ng is ON|
|000049c0| 22 20 22 41 75 74 6f 2d | 72 65 66 69 6e 69 6e 67 |" "Auto-|refining|
|000049d0| 20 69 73 20 4f 46 46 22 | 20 6f 66 66 20 65 64 69 | is OFF"| off edi|
|000049e0| 66 66 2d 73 65 74 2d 66 | 69 6e 65 2d 64 69 66 66 |ff-set-f|ine-diff|
|000049f0| 2d 70 72 6f 70 65 72 74 | 69 65 73 20 64 65 66 61 |-propert|ies defa|
|00004a00| 75 6c 74 20 22 52 65 66 | 69 6e 65 6d 65 6e 74 73 |ult "Ref|inements|
|00004a10| 20 61 72 65 20 48 49 44 | 44 45 4e 22 5d 20 33 20 | are HID|DEN"] 3 |
|00004a20| 28 23 24 20 2e 20 31 38 | 34 36 33 29 20 6e 69 6c |(#$ . 18|463) nil|
|00004a30| 5d 29 0a 23 40 34 38 20 | 53 68 6f 77 20 74 68 65 |]).#@48 |Show the|
|00004a40| 20 61 6e 63 65 73 74 6f | 72 20 62 75 66 66 65 72 | ancesto|r buffer|
|00004a50| 20 69 6e 20 61 20 73 75 | 69 74 61 62 6c 65 20 77 | in a su|itable w|
|00004a60| 69 6e 64 6f 77 2e 1f 0a | 28 64 65 66 61 6c 69 61 |indow...|(defalia|
|00004a70| 73 20 27 65 64 69 66 66 | 2d 73 68 6f 77 2d 61 6e |s 'ediff|-show-an|
|00004a80| 63 65 73 74 6f 72 20 23 | 5b 6e 69 6c 20 22 c0 20 |cestor #|[nil ". |
|00004a90| 88 09 ab 8c c2 09 21 ab | 87 c3 c2 09 21 21 ac 8d |......!.|....!!..|
|00004aa0| 0c ab 86 c5 c6 21 88 aa | 84 c5 c7 21 88 c8 1e 09 |.....!..|...!....|
|00004ab0| ca 09 21 89 16 09 ab 88 | cb cc 0e 09 21 21 aa 85 |..!.....|....!!..|
|00004ac0| cd 0e 0e 09 5c 22 29 87 | 22 20 5b 65 64 69 66 66 |....\").|" [ediff|
|00004ad0| 2d 72 65 63 65 6e 74 65 | 72 20 65 64 69 66 66 2d |-recente|r ediff-|
|00004ae0| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00004af0| 67 65 74 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |get-buff|er buffe|
|00004b00| 72 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 6d 65 72 |r-name e|diff-mer|
|00004b10| 67 65 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ge-with-|ancestor|
|00004b20| 2d 6a 6f 62 20 65 72 72 | 6f 72 20 22 4c 6f 73 74 |-job err|or "Lost|
|00004b30| 20 63 6f 6e 6e 65 63 74 | 69 6f 6e 20 74 6f 20 61 | connect|ion to a|
|00004b40| 6e 63 65 73 74 6f 72 20 | 62 75 66 66 65 72 2e 2e |ncestor |buffer..|
|00004b50| 2e 73 6f 72 72 79 22 20 | 22 4e 6f 74 20 6d 65 72 |.sorry" |"Not mer|
|00004b60| 67 69 6e 67 20 77 69 74 | 68 20 61 6e 63 65 73 74 |ging wit|h ancest|
|00004b70| 6f 72 22 20 6e 69 6c 20 | 77 69 6e 64 20 65 64 69 |or" nil |wind edi|
|00004b80| 66 66 2d 67 65 74 2d 76 | 69 73 69 62 6c 65 2d 62 |ff-get-v|isible-b|
|00004b90| 75 66 66 65 72 2d 77 69 | 6e 64 6f 77 20 72 61 69 |uffer-wi|ndow rai|
|00004ba0| 73 65 2d 66 72 61 6d 65 | 20 77 69 6e 64 6f 77 2d |se-frame| window-|
|00004bb0| 66 72 61 6d 65 20 73 65 | 74 2d 77 69 6e 64 6f 77 |frame se|t-window|
|00004bc0| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 77 69 |-buffer |ediff-wi|
|00004bd0| 6e 64 6f 77 2d 43 5d 20 | 33 20 28 23 24 20 2e 20 |ndow-C] |3 (#$ . |
|00004be0| 31 39 30 30 30 29 20 6e | 69 6c 5d 29 0a 23 40 31 |19000) n|il]).#@1|
|00004bf0| 32 33 20 43 6f 6d 70 75 | 74 65 20 66 69 6e 65 20 |23 Compu|te fine |
|00004c00| 64 69 66 66 73 2e 20 57 | 69 74 68 20 6e 65 67 61 |diffs. W|ith nega|
|00004c10| 74 69 76 65 20 70 72 65 | 66 69 78 20 61 72 67 2c |tive pre|fix arg,|
|00004c20| 20 6b 69 6c 6c 20 66 69 | 6e 65 20 64 69 66 66 73 | kill fi|ne diffs|
|00004c30| 2e 0a 49 6e 20 62 6f 74 | 68 20 63 61 73 65 73 2c |..In bot|h cases,|
|00004c40| 20 6f 70 65 72 61 74 65 | 73 20 6f 6e 20 74 68 65 | operate|s on the|
|00004c50| 20 63 75 72 72 72 65 6e | 74 20 64 69 66 66 65 72 | currren|t differ|
|00004c60| 65 6e 63 65 20 72 65 67 | 69 6f 6e 2e 1f 0a 28 64 |ence reg|ion...(d|
|00004c70| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 6d |efalias |'ediff-m|
|00004c80| 61 6b 65 2d 6f 72 2d 6b | 69 6c 6c 2d 66 69 6e 65 |ake-or-k|ill-fine|
|00004c90| 2d 64 69 66 66 73 20 23 | 5b 28 61 72 67 29 20 22 |-diffs #|[(arg) "|
|00004ca0| c0 19 c2 09 21 ac 85 c3 | c4 0d 5c 22 88 29 0e 06 |....!...|..\".)..|
|00004cb0| c7 61 ab 9b 0e 08 1e 09 | ca 0e 09 cb 5c 22 88 ca |.a......|....\"..|
|00004cc0| 0e 09 cc 5c 22 88 0e 0d | ad 85 ca 0e 09 ce 5c 22 |...\"...|......\"|
|00004cd0| 29 87 0e 06 a7 ab a1 0e | 06 cf 57 ab 9b 0e 08 1e |).......|..W.....|
|00004ce0| 09 ca 0e 09 cb 5c 22 88 | ca 0e 09 cc 5c 22 88 0e |.....\".|....\"..|
|00004cf0| 0d ad 85 ca 0e 09 ce 5c | 22 29 87 d0 20 87 22 20 |.......\|").. ." |
|00004d00| 5b 6e 69 6c 20 6d 65 74 | 61 2d 62 75 66 2d 70 20 |[nil met|a-buf-p |
|00004d10| 65 64 69 66 66 2d 69 6e | 2d 63 6f 6e 74 72 6f 6c |ediff-in|-control|
|00004d20| 2d 62 75 66 66 65 72 2d | 70 20 65 72 72 6f 72 20 |-buffer-|p error |
|00004d30| 22 25 53 3a 20 54 68 69 | 73 20 63 6f 6d 6d 61 6e |"%S: Thi|s comman|
|00004d40| 64 20 72 75 6e 73 20 69 | 6e 20 45 64 69 66 66 20 |d runs i|n Ediff |
|00004d50| 43 6f 6e 74 72 6f 6c 20 | 42 75 66 66 65 72 20 6f |Control |Buffer o|
|00004d60| 6e 6c 79 21 22 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |nly!" th|is-comma|
|00004d70| 6e 64 20 61 72 67 20 2d | 20 65 64 69 66 66 2d 63 |nd arg -| ediff-c|
|00004d80| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00004d90| 65 20 6e 20 65 64 69 66 | 66 2d 63 6c 65 61 72 2d |e n edif|f-clear-|
|00004da0| 66 69 6e 65 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |fine-dif|ferences|
|00004db0| 2d 69 6e 2d 6f 6e 65 2d | 62 75 66 66 65 72 20 41 |-in-one-|buffer A|
|00004dc0| 20 42 20 65 64 69 66 66 | 2d 33 77 61 79 2d 6a 6f | B ediff|-3way-jo|
|00004dd0| 62 20 43 20 30 20 65 64 | 69 66 66 2d 6d 61 6b 65 |b C 0 ed|iff-make|
|00004de0| 2d 66 69 6e 65 2d 64 69 | 66 66 73 5d 20 33 20 28 |-fine-di|ffs] 3 (|
|00004df0| 23 24 20 2e 20 31 39 34 | 34 33 29 20 22 50 22 5d |#$ . 194|43) "P"]|
|00004e00| 29 0a 23 40 33 33 20 54 | 6f 67 67 6c 65 20 73 68 |).#@33 T|oggle sh|
|00004e10| 6f 72 74 2f 6c 6f 6e 67 | 20 68 65 6c 70 20 6d 65 |ort/long| help me|
|00004e20| 73 73 61 67 65 2e 1f 0a | 28 64 65 66 61 6c 69 61 |ssage...|(defalia|
|00004e30| 73 20 27 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |s 'ediff|-toggle-|
|00004e40| 68 65 6c 70 20 23 5b 6e | 69 6c 20 22 c0 19 c2 09 |help #[n|il "....|
|00004e50| 21 ac 85 c3 c4 0d 5c 22 | 88 29 c0 1e 06 c7 20 88 |!.....\"|.).... .|
|00004e60| 0e 08 3f 16 08 c9 20 88 | 29 0e 08 ab a9 ca 20 ab |..?... .|)..... .|
|00004e70| a5 0e 0b ab a1 0e 0c 1e | 0d ca 20 ad 96 ce 0e 0d |........|.. .....|
|00004e80| 21 ad 90 0e 0f ab 86 d0 | 0e 0d 21 aa 86 d1 0e 0d |!.......|..!.....|
|00004e90| 21 d2 61 29 16 13 d4 16 | 15 d6 d7 21 87 22 20 5b |!.a)....|...!." [|
|00004ea0| 6e 69 6c 20 6d 65 74 61 | 2d 62 75 66 2d 70 20 65 |nil meta|-buf-p e|
|00004eb0| 64 69 66 66 2d 69 6e 2d | 63 6f 6e 74 72 6f 6c 2d |diff-in-|control-|
|00004ec0| 62 75 66 66 65 72 2d 70 | 20 65 72 72 6f 72 20 22 |buffer-p| error "|
|00004ed0| 25 53 3a 20 54 68 69 73 | 20 63 6f 6d 6d 61 6e 64 |%S: This| command|
|00004ee0| 20 72 75 6e 73 20 69 6e | 20 45 64 69 66 66 20 43 | runs in| Ediff C|
|00004ef0| 6f 6e 74 72 6f 6c 20 42 | 75 66 66 65 72 20 6f 6e |ontrol B|uffer on|
|00004f00| 6c 79 21 22 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ly!" thi|s-comman|
|00004f10| 64 20 62 75 66 66 65 72 | 2d 72 65 61 64 2d 6f 6e |d buffer|-read-on|
|00004f20| 6c 79 20 65 72 61 73 65 | 2d 62 75 66 66 65 72 20 |ly erase|-buffer |
|00004f30| 65 64 69 66 66 2d 75 73 | 65 2d 6c 6f 6e 67 2d 68 |ediff-us|e-long-h|
|00004f40| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 65 64 69 66 |elp-mess|age edif|
|00004f50| 66 2d 73 65 74 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |f-set-he|lp-messa|
|00004f60| 67 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |ge ediff|-window-|
|00004f70| 64 69 73 70 6c 61 79 2d | 70 20 65 64 69 66 66 2d |display-|p ediff-|
|00004f80| 6d 75 6c 74 69 66 72 61 | 6d 65 20 65 64 69 66 66 |multifra|me ediff|
|00004f90| 2d 63 6f 6e 74 72 6f 6c | 2d 66 72 61 6d 65 20 66 |-control|-frame f|
|00004fa0| 72 61 6d 65 20 66 72 61 | 6d 65 2d 6c 69 76 65 2d |rame fra|me-live-|
|00004fb0| 70 20 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 |p ediff-|xemacs-p|
|00004fc0| 20 66 72 61 6d 65 2d 69 | 63 6f 6e 69 66 69 65 64 | frame-i|conified|
|00004fd0| 2d 70 20 66 72 61 6d 65 | 2d 76 69 73 69 62 6c 65 |-p frame|-visible|
|00004fe0| 2d 70 20 69 63 6f 6e 20 | 65 64 69 66 66 2d 70 72 |-p icon |ediff-pr|
|00004ff0| 65 66 65 72 2d 69 63 6f | 6e 69 66 69 65 64 2d 63 |efer-ico|nified-c|
|00005000| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 22 22 20 |ontrol-f|rame "" |
|00005010| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 63 6f 6e |ediff-wi|ndow-con|
|00005020| 66 69 67 2d 73 61 76 65 | 64 20 65 64 69 66 66 2d |fig-save|d ediff-|
|00005030| 72 65 63 65 6e 74 65 72 | 20 6e 6f 2d 72 65 68 69 |recenter| no-rehi|
|00005040| 67 68 6c 69 67 68 74 5d | 20 33 20 28 23 24 20 2e |ghlight]| 3 (#$ .|
|00005050| 20 31 39 39 37 35 29 20 | 6e 69 6c 5d 29 0a 23 40 | 19975) |nil]).#@|
|00005060| 32 30 36 20 54 6f 67 67 | 6c 65 20 72 65 61 64 2d |206 Togg|le read-|
|00005070| 6f 6e 6c 79 20 69 6e 20 | 63 75 72 72 65 6e 74 20 |only in |current |
|00005080| 62 75 66 66 65 72 2e 0a | 49 66 20 62 75 66 66 65 |buffer..|If buffe|
|00005090| 72 20 69 73 20 75 6e 64 | 65 72 20 76 65 72 73 69 |r is und|er versi|
|000050a0| 6f 6e 20 63 6f 6e 74 72 | 6f 6c 20 61 6e 64 20 6c |on contr|ol and l|
|000050b0| 6f 63 6b 65 64 2c 20 63 | 68 65 63 6b 20 69 74 20 |ocked, c|heck it |
|000050c0| 6f 75 74 20 66 69 72 73 | 74 2e 0a 49 66 20 6f 70 |out firs|t..If op|
|000050d0| 74 69 6f 6e 61 6c 20 61 | 72 67 75 6d 65 6e 74 20 |tional a|rgument |
|000050e0| 42 55 46 20 69 73 20 73 | 70 65 63 69 66 69 65 64 |BUF is s|pecified|
|000050f0| 2c 20 74 6f 67 67 6c 65 | 20 72 65 61 64 2d 6f 6e |, toggle| read-on|
|00005100| 6c 79 20 69 6e 20 74 68 | 61 74 20 62 75 66 66 65 |ly in th|at buffe|
|00005110| 72 20 69 6e 73 74 65 61 | 64 0a 6f 66 20 74 68 65 |r instea|d.of the|
|00005120| 20 63 75 72 72 65 6e 74 | 20 62 75 66 66 65 72 2e | current| buffer.|
|00005130| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00005140| 66 66 2d 74 6f 67 67 6c | 65 2d 72 65 61 64 2d 6f |ff-toggl|e-read-o|
|00005150| 6e 6c 79 20 23 5b 28 26 | 6f 70 74 69 6f 6e 61 6c |nly #[(&|optional|
|00005160| 20 62 75 66 29 20 22 c0 | 19 c2 09 21 ac 85 c3 c4 | buf) ".|...!....|
|00005170| 0d 5c 22 88 29 0e 06 3f | ad 81 70 0e 07 c8 73 ab |.\".)..?|..p...s.|
|00005180| 83 c9 aa 90 0e 07 ca 73 | ab 83 cb aa 87 0e 07 cc |.......s|........|
|00005190| 73 ad 81 cd 1e 0e 1e 0f | 0e 06 ac 83 d0 20 88 0e |s.......|..... ..|
|000051a0| 06 ac a8 0e 0e c9 61 ab | 84 0e 11 aa 9c 0e 0e cb |......a.|........|
|000051b0| 61 ab 84 0e 12 aa 92 0e | 0e cd 61 ab 84 0e 13 aa |a.......|..a.....|
|000051c0| 88 0e 0e d4 61 ad 82 0e | 15 16 06 0e 06 83 4f 01 |....a...|......O.|
|000051d0| d6 0e 06 21 83 4f 01 d7 | d6 0e 06 21 21 83 4f 01 |...!.O..|...!!.O.|
|000051e0| 72 0e 06 71 88 d8 0e 06 | 21 89 1e 19 ad 8a da 0e |r..q....|!.......|
|000051f0| 19 21 ad 84 db 0e 19 21 | 1e 1c 0e 1d ae 93 de 0e |.!.....!|........|
|00005200| 19 21 ab 83 df aa 8a 0e | 1c ab 83 df aa 83 e0 e1 |.!......|........|
|00005210| 21 1e 5c 22 e3 0e 19 21 | ab dc 0e 0f ab d8 0e 24 |!.\"...!|.......$|
|00005220| ac 85 df 16 5c 22 aa cf | e5 e6 21 88 e7 e8 e9 ea |....\"..|..!.....|
|00005230| 0e 19 21 5c 22 21 ab ad | 0e 0f ab 9d d6 0e 0f 21 |..!\"!..|.......!|
|00005240| ab 97 d7 d6 0e 0f 21 21 | ab 8f 72 0e 0f 71 88 eb |......!!|..r..q..|
|00005250| e4 c0 0e 0e 23 88 29 aa | 9f 0d ec 61 ac 9a c3 0e |....#.).|...a....|
|00005260| 2d 21 88 aa 93 df 16 5c | 22 e5 e6 21 88 e5 e6 21 |-!.....\|"..!...!|
|00005270| 88 ee ef 21 88 f0 f1 21 | 88 0e 5c 22 ab 90 f2 f3 |...!...!|..\"....|
|00005280| f4 0e 5c 22 21 5c 22 ab | 87 8a f5 8b 88 29 aa 86 |..\"!\".|.....)..|
|00005290| c3 f6 0e 06 5c 22 88 0e | 19 ad a1 0e 24 3f ad 9c |....\"..|....$?..|
|000052a0| 0d f7 61 ad 97 da 0e 19 | 21 ad 91 db 0e 19 21 3f |..a.....|!.....!?|
|000052b0| ad 8a ee f8 ea 0e 19 21 | e5 e6 21 23 2c aa 89 0d |.......!|..!#,...|
|000052c0| ec 61 ae 84 c3 0e 2d 21 | 2a 87 22 20 5b 6e 69 6c |.a....-!|*." [nil|
|000052d0| 20 6d 65 74 61 2d 62 75 | 66 2d 70 20 65 64 69 66 | meta-bu|f-p edif|
|000052e0| 66 2d 69 6e 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |f-in-con|trol-buf|
|000052f0| 66 65 72 2d 70 20 65 72 | 72 6f 72 20 22 25 53 3a |fer-p er|ror "%S:|
|00005300| 20 54 68 69 73 20 63 6f | 6d 6d 61 6e 64 20 72 75 | This co|mmand ru|
|00005310| 6e 73 20 69 6e 20 45 64 | 69 66 66 20 43 6f 6e 74 |ns in Ed|iff Cont|
|00005320| 72 6f 6c 20 42 75 66 66 | 65 72 20 6f 6e 6c 79 21 |rol Buff|er only!|
|00005330| 22 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 62 |" this-c|ommand b|
|00005340| 75 66 20 6c 61 73 74 2d | 63 6f 6d 6d 61 6e 64 2d |uf last-|command-|
|00005350| 63 68 61 72 20 28 3f 61 | 20 3f 41 29 20 41 20 28 |char (?a| ?A) A (|
|00005360| 3f 62 20 3f 42 29 20 42 | 20 28 3f 63 20 3f 43 29 |?b ?B) B| (?c ?C)|
|00005370| 20 43 20 62 75 66 2d 74 | 79 70 65 20 63 74 6c 2d | C buf-t|ype ctl-|
|00005380| 62 75 66 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |buf edif|f-recent|
|00005390| 65 72 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |er ediff|-buffer-|
|000053a0| 41 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 42 |A ediff-|buffer-B|
|000053b0| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 43 20 | ediff-b|uffer-C |
|000053c0| 41 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 61 |Ancestor| ediff-a|
|000053d0| 6e 63 65 73 74 6f 72 2d | 62 75 66 66 65 72 20 67 |ncestor-|buffer g|
|000053e0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|000053f0| 2d 6e 61 6d 65 20 62 75 | 66 66 65 72 2d 66 69 6c |-name bu|ffer-fil|
|00005400| 65 2d 6e 61 6d 65 20 66 | 69 6c 65 20 66 69 6c 65 |e-name f|ile file|
|00005410| 2d 65 78 69 73 74 73 2d | 70 20 66 69 6c 65 2d 77 |-exists-|p file-w|
|00005420| 72 69 74 61 62 6c 65 2d | 70 20 66 69 6c 65 2d 77 |ritable-|p file-w|
|00005430| 72 69 74 61 62 6c 65 20 | 65 64 69 66 66 2d 74 6f |ritable |ediff-to|
|00005440| 67 67 6c 65 2d 72 65 61 | 64 2d 6f 6e 6c 79 2d 66 |ggle-rea|d-only-f|
|00005450| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 66 69 |unction |ediff-fi|
|00005460| 6c 65 2d 63 68 65 63 6b | 65 64 2d 6f 75 74 2d 70 |le-check|ed-out-p|
|00005470| 20 74 6f 67 67 6c 65 2d | 72 65 61 64 2d 6f 6e 6c | toggle-|read-onl|
|00005480| 79 20 6b 65 79 2d 62 69 | 6e 64 69 6e 67 20 22 18 |y key-bi|nding ".|
|00005490| 11 22 20 74 6f 67 67 6c | 65 2d 72 6f 2d 63 6d 64 |." toggl|e-ro-cmd|
|000054a0| 20 65 64 69 66 66 2d 66 | 69 6c 65 2d 63 68 65 63 | ediff-f|ile-chec|
|000054b0| 6b 65 64 2d 69 6e 2d 70 | 20 62 75 66 66 65 72 2d |ked-in-p| buffer-|
|000054c0| 72 65 61 64 2d 6f 6e 6c | 79 20 62 65 65 70 20 31 |read-onl|y beep 1|
|000054d0| 20 79 2d 6f 72 2d 6e 2d | 70 20 66 6f 72 6d 61 74 | y-or-n-|p format|
|000054e0| 20 22 46 69 6c 65 20 25 | 73 20 69 73 20 75 6e 64 | "File %|s is und|
|000054f0| 65 72 20 76 65 72 73 69 | 6f 6e 20 63 6f 6e 74 72 |er versi|on contr|
|00005500| 6f 6c 2e 20 43 68 65 63 | 6b 20 69 74 20 6f 75 74 |ol. Chec|k it out|
|00005510| 3f 20 22 20 65 64 69 66 | 66 2d 61 62 62 72 65 76 |? " edif|f-abbrev|
|00005520| 69 61 74 65 2d 66 69 6c | 65 2d 6e 61 6d 65 20 65 |iate-fil|e-name e|
|00005530| 64 69 66 66 2d 63 68 61 | 6e 67 65 2d 73 61 76 65 |diff-cha|nge-save|
|00005540| 64 2d 76 61 72 69 61 62 | 6c 65 20 65 64 69 66 66 |d-variab|le ediff|
|00005550| 2d 71 75 69 74 20 65 64 | 69 66 66 2d 4b 49 4c 4c |-quit ed|iff-KILL|
|00005560| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|00005570| 6d 65 73 73 61 67 65 20 | 22 42 6f 79 2c 20 74 68 |message |"Boy, th|
|00005580| 69 73 20 69 73 20 72 69 | 73 6b 79 21 20 44 6f 6e |is is ri|sky! Don|
|00005590| 27 74 20 6d 6f 64 69 66 | 79 20 74 68 69 73 20 66 |'t modif|y this f|
|000055a0| 69 6c 65 2e 2e 2e 22 20 | 73 69 74 2d 66 6f 72 20 |ile..." |sit-for |
|000055b0| 33 20 73 74 72 69 6e 67 | 2d 6d 61 74 63 68 20 22 |3 string|-match "|
|000055c0| 74 6f 67 67 6c 65 2d 72 | 65 61 64 2d 6f 6e 6c 79 |toggle-r|ead-only|
|000055d0| 22 20 73 79 6d 62 6f 6c | 2d 6e 61 6d 65 20 28 28 |" symbol|-name ((|
|000055e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 5c 6e 21 |byte-cod|e "..\n!|
|000055f0| 21 88 c3 0c 21 87 22 20 | 5b 73 65 6c 65 63 74 2d |!...!." |[select-|
|00005600| 77 69 6e 64 6f 77 20 65 | 64 69 66 66 2d 67 65 74 |window e|diff-get|
|00005610| 2d 76 69 73 69 62 6c 65 | 2d 62 75 66 66 65 72 2d |-visible|-buffer-|
|00005620| 77 69 6e 64 6f 77 20 62 | 75 66 20 63 6f 6d 6d 61 |window b|uf comma|
|00005630| 6e 64 2d 65 78 65 63 75 | 74 65 20 74 6f 67 67 6c |nd-execu|te toggl|
|00005640| 65 2d 72 6f 2d 63 6d 64 | 5d 20 33 29 29 20 22 44 |e-ro-cmd|] 3)) "D|
|00005650| 6f 6e 27 74 20 6b 6e 6f | 77 20 68 6f 77 20 74 6f |on't kno|w how to|
|00005660| 20 74 6f 67 67 6c 65 20 | 72 65 61 64 2d 6f 6e 6c | toggle |read-onl|
|00005670| 79 20 69 6e 20 62 75 66 | 66 65 72 20 25 53 22 20 |y in buf|fer %S" |
|00005680| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 72 65 61 |ediff-to|ggle-rea|
|00005690| 64 2d 6f 6e 6c 79 20 22 | 57 61 72 6e 69 6e 67 3a |d-only "|Warning:|
|000056a0| 20 66 69 6c 65 20 25 73 | 20 69 73 20 72 65 61 64 | file %s| is read|
|000056b0| 2d 6f 6e 6c 79 22 5d 20 | 36 20 28 23 24 20 2e 20 |-only"] |6 (#$ . |
|000056c0| 32 30 35 38 30 29 20 6e | 69 6c 5d 29 0a 28 64 65 |20580) n|il]).(de|
|000056d0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6d 61 |falias '|ediff-ma|
|000056e0| 79 62 65 2d 63 68 65 63 | 6b 6f 75 74 20 23 5b 28 |ybe-chec|kout #[(|
|000056f0| 62 75 66 29 20 22 c0 09 | 21 c2 c3 21 1c 1d c6 0d |buf) "..|!..!....|
|00005700| 21 ad b1 c7 c8 21 88 c9 | ca cb cc 0d 21 5c 22 21 |!....!..|....!\"!|
|00005710| ad a3 09 ab 96 cd 09 21 | ab 91 ce cd 09 21 21 ab |.......!|.....!!.|
|00005720| 8a 72 09 71 88 cf 0c 21 | 29 aa 8a 0e 10 d1 61 ae |.r.q...!|).....a.|
|00005730| 84 d2 0e 13 21 2a 87 22 | 20 5b 62 75 66 66 65 72 |....!*."| [buffer|
|00005740| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 62 75 66 20 6b |-file-na|me buf k|
|00005750| 65 79 2d 62 69 6e 64 69 | 6e 67 20 22 18 11 22 20 |ey-bindi|ng ".." |
|00005760| 63 68 65 63 6b 6f 75 74 | 2d 66 75 6e 63 74 69 6f |checkout|-functio|
|00005770| 6e 20 66 69 6c 65 20 65 | 64 69 66 66 2d 66 69 6c |n file e|diff-fil|
|00005780| 65 2d 63 68 65 63 6b 65 | 64 2d 69 6e 2d 70 20 62 |e-checke|d-in-p b|
|00005790| 65 65 70 20 31 20 79 2d | 6f 72 2d 6e 2d 70 20 66 |eep 1 y-|or-n-p f|
|000057a0| 6f 72 6d 61 74 20 22 46 | 69 6c 65 20 25 73 20 69 |ormat "F|ile %s i|
|000057b0| 73 20 75 6e 64 65 72 20 | 76 65 72 73 69 6f 6e 20 |s under |version |
|000057c0| 63 6f 6e 74 72 6f 6c 2e | 20 43 68 65 63 6b 20 69 |control.| Check i|
|000057d0| 74 20 6f 75 74 3f 20 22 | 20 65 64 69 66 66 2d 61 |t out? "| ediff-a|
|000057e0| 62 62 72 65 76 69 61 74 | 65 2d 66 69 6c 65 2d 6e |bbreviat|e-file-n|
|000057f0| 61 6d 65 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |ame get-|buffer b|
|00005800| 75 66 66 65 72 2d 6e 61 | 6d 65 20 63 6f 6d 6d 61 |uffer-na|me comma|
|00005810| 6e 64 2d 65 78 65 63 75 | 74 65 20 74 68 69 73 2d |nd-execu|te this-|
|00005820| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00005830| 69 74 20 65 72 72 6f 72 | 20 65 64 69 66 66 2d 4b |it error| ediff-K|
|00005840| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|00005850| 45 52 5d 20 35 5d 29 0a | 28 64 65 66 61 6c 69 61 |ER] 5]).|(defalia|
|00005860| 73 20 27 65 64 69 66 66 | 2d 66 69 6c 65 2d 75 6e |s 'ediff|-file-un|
|00005870| 64 65 72 2d 76 65 72 73 | 69 6f 6e 2d 63 6f 6e 74 |der-vers|ion-cont|
|00005880| 72 6f 6c 20 23 5b 28 66 | 69 6c 65 29 20 22 c0 09 |rol #[(f|ile) "..|
|00005890| 21 1a c3 09 21 89 1c c5 | 50 1e 06 5c 6e 0e 06 50 |!...!...|P..\n..P|
|000058a0| 1e 07 5c 6e c8 0e 06 51 | 1e 09 09 3b ad 9a ca 09 |..\n...Q|...;....|
|000058b0| 21 ad 95 ca 0e 07 21 ab | 8b cb 09 21 cb 0e 07 21 |!.....!.|...!...!|
|000058c0| 6b 3f ae 84 ca 0e 09 21 | 2d 87 22 20 5b 66 69 6c |k?.....!|-." [fil|
|000058d0| 65 2d 6e 61 6d 65 2d 64 | 69 72 65 63 74 6f 72 79 |e-name-d|irectory|
|000058e0| 20 66 69 6c 65 20 66 69 | 6c 65 64 69 72 20 66 69 | file fi|ledir fi|
|000058f0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00005900| 74 6f 72 79 20 66 69 6c | 65 2d 6e 6f 6e 64 69 72 |tory fil|e-nondir|
|00005910| 20 22 2c 76 22 20 74 72 | 69 61 6c 20 66 75 6c 6c | ",v" tr|ial full|
|00005920| 2d 74 72 69 61 6c 20 22 | 52 43 53 2f 22 20 66 75 |-trial "|RCS/" fu|
|00005930| 6c 6c 2d 72 63 73 2d 74 | 72 69 61 6c 20 66 69 6c |ll-rcs-t|rial fil|
|00005940| 65 2d 65 78 69 73 74 73 | 2d 70 20 66 69 6c 65 2d |e-exists|-p file-|
|00005950| 61 74 74 72 69 62 75 74 | 65 73 5d 20 34 5d 29 0a |attribut|es] 4]).|
|00005960| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00005970| 2d 66 69 6c 65 2d 63 68 | 65 63 6b 65 64 2d 6f 75 |-file-ch|ecked-ou|
|00005980| 74 2d 70 20 23 5b 28 66 | 69 6c 65 29 20 22 c0 09 |t-p #[(f|ile) "..|
|00005990| 21 ad 83 c2 09 21 87 22 | 20 5b 65 64 69 66 66 2d |!....!."| [ediff-|
|000059a0| 66 69 6c 65 2d 75 6e 64 | 65 72 2d 76 65 72 73 69 |file-und|er-versi|
|000059b0| 6f 6e 2d 63 6f 6e 74 72 | 6f 6c 20 66 69 6c 65 20 |on-contr|ol file |
|000059c0| 66 69 6c 65 2d 77 72 69 | 74 61 62 6c 65 2d 70 5d |file-wri|table-p]|
|000059d0| 20 32 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 2]).(de|falias '|
|000059e0| 65 64 69 66 66 2d 66 69 | 6c 65 2d 63 68 65 63 6b |ediff-fi|le-check|
|000059f0| 65 64 2d 69 6e 2d 70 20 | 23 5b 28 66 69 6c 65 29 |ed-in-p |#[(file)|
|00005a00| 20 22 c0 09 21 ad 84 c2 | 09 21 3f 87 22 20 5b 65 | "..!...|.!?." [e|
|00005a10| 64 69 66 66 2d 66 69 6c | 65 2d 75 6e 64 65 72 2d |diff-fil|e-under-|
|00005a20| 76 65 72 73 69 6f 6e 2d | 63 6f 6e 74 72 6f 6c 20 |version-|control |
|00005a30| 66 69 6c 65 20 66 69 6c | 65 2d 77 72 69 74 61 62 |file fil|e-writab|
|00005a40| 6c 65 2d 70 5d 20 32 5d | 29 0a 23 40 34 34 20 52 |le-p] 2]|).#@44 R|
|00005a50| 6f 74 61 74 65 20 74 68 | 65 20 64 69 73 70 6c 61 |otate th|e displa|
|00005a60| 79 20 6f 66 20 62 75 66 | 66 65 72 73 20 41 2c 20 |y of buf|fers A, |
|00005a70| 42 2c 20 61 6e 64 20 43 | 2e 1f 0a 28 64 65 66 61 |B, and C|...(defa|
|00005a80| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 73 77 61 70 |lias 'ed|iff-swap|
|00005a90| 2d 62 75 66 66 65 72 73 | 20 23 5b 6e 69 6c 20 22 |-buffers| #[nil "|
|00005aa0| c0 19 c2 09 21 ac 85 c3 | c4 0d 5c 22 88 29 c6 0e |....!...|..\".)..|
|00005ab0| 07 21 83 6d 01 c6 0e 08 | 21 83 6d 01 0e 09 0e 5c |.!.m....|!.m....\|
|00005ac0| 6e 0e 0b 0e 0c 0e 0d 0e | 0e 0e 0f 61 d0 20 ad 82 |n.......|...a. ..|
|00005ad0| 0e 11 1e 12 1e 13 1e 14 | 1e 15 1e 16 1e 17 1e 18 |........|........|
|00005ae0| 0e 19 ab 97 da 0e 07 0e | 1b 5c 22 88 da 0e 08 0e |........|.\".....|
|00005af0| 09 5c 22 88 da 0e 1c 0e | 1d 5c 22 88 aa 8e da 0e |.\".....|.\".....|
|00005b00| 07 0e 1d 5c 22 88 da 0e | 08 0e 09 5c 22 88 0e 19 |...\"...|...\"...|
|00005b10| ab 8e 0e 1b 16 09 0e 1d | 16 1b 0e 18 16 1d aa 88 |........|........|
|00005b20| 0e 1d 16 09 0e 18 16 1d | 0e 19 ab 8e 0e 1e 16 5c |........|.......\|
|00005b30| 6e 0e 1f 16 1e 0e 17 16 | 1f aa 88 0e 1f 16 5c 6e |n.......|......\n|
|00005b40| 0e 17 16 1f 0e 19 ab 8e | 0e 20 16 0b 0e 21 16 20 |........|. ...!. |
|00005b50| 0e 16 16 21 aa 88 0e 21 | 16 0b 0e 16 16 21 0e 19 |...!...!|.....!..|
|00005b60| ab 9a 0e 5c 22 16 0c 0e | 23 16 5c 22 0e 15 16 23 |...\"...|#.\"...#|
|00005b70| 0e 24 16 0d 0e 25 16 24 | 0e 14 16 25 aa 90 0e 23 |.$...%.$|...%...#|
|00005b80| 16 0c 0e 15 16 23 0e 25 | 16 0d 0e 14 16 25 d0 20 |.....#.%|.....%. |
|00005b90| ab 9a 0e 19 ab 8e 0e 26 | 16 11 0e 27 16 26 0e 12 |.......&|...'.&..|
|00005ba0| 16 27 aa 88 0e 27 16 11 | 0e 12 16 27 0e 19 ab 8e |.'...'..|...'....|
|00005bb0| e8 0e 0f 38 0e 0f 40 0e | 0f 41 40 45 aa 9a 0e 29 |...8..@.|.A@E...)|
|00005bc0| ab 8e 0e 0f 41 40 0e 0f | 40 e8 0e 0f 38 45 aa 88 |....A@..|@...8E..|
|00005bd0| 0e 0f 41 40 0e 0f 40 44 | 16 0f 0e 19 ab 8e e8 0e |..A@..@D|........|
|00005be0| 2a 38 0e 2a 40 0e 2a 41 | 40 45 aa 9a 0e 29 ab 8e |*8.*@.*A|@E...)..|
|00005bf0| 0e 2a 41 40 0e 2a 40 e8 | 0e 2a 38 45 aa 88 0e 2a |.*A@.*@.|.*8E...*|
|00005c00| 41 40 0e 2a 40 44 16 2a | 0e 13 ab 86 0e 0f 16 0e |A@.*@D.*|........|
|00005c10| aa 84 0e 2a 16 0e 2e 07 | 0e 29 ab 9d 0e 2b 1e 2c |...*....|.)...+.,|
|00005c20| ed 1e 2e ed 0e 2f 57 ab | 8f f0 0e 2e 0e 2c 5c 22 |...../W.|.....,\"|
|00005c30| 88 0e 2e 54 89 16 2e aa | 6c 2a f1 f2 21 87 22 20 |...T....|l*..!." |
|00005c40| 5b 6e 69 6c 20 6d 65 74 | 61 2d 62 75 66 2d 70 20 |[nil met|a-buf-p |
|00005c50| 65 64 69 66 66 2d 69 6e | 2d 63 6f 6e 74 72 6f 6c |ediff-in|-control|
|00005c60| 2d 62 75 66 66 65 72 2d | 70 20 65 72 72 6f 72 20 |-buffer-|p error |
|00005c70| 22 25 53 3a 20 54 68 69 | 73 20 63 6f 6d 6d 61 6e |"%S: Thi|s comman|
|00005c80| 64 20 72 75 6e 73 20 69 | 6e 20 45 64 69 66 66 20 |d runs i|n Ediff |
|00005c90| 43 6f 6e 74 72 6f 6c 20 | 42 75 66 66 65 72 20 6f |Control |Buffer o|
|00005ca0| 6e 6c 79 21 22 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |nly!" th|is-comma|
|00005cb0| 6e 64 20 77 69 6e 64 6f | 77 2d 6c 69 76 65 2d 70 |nd windo|w-live-p|
|00005cc0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00005cd0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 42 20 65 |ediff-wi|ndow-B e|
|00005ce0| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 41 20 65 64 |diff-buf|fer-A ed|
|00005cf0| 69 66 66 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |iff-buff|er-value|
|00005d00| 73 2d 6f 72 69 67 2d 41 | 20 65 64 69 66 66 2d 64 |s-orig-A| ediff-d|
|00005d10| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00005d20| 2d 41 20 65 64 69 66 66 | 2d 72 65 67 65 78 70 2d |-A ediff|-regexp-|
|00005d30| 68 69 64 65 2d 41 20 65 | 64 69 66 66 2d 72 65 67 |hide-A e|diff-reg|
|00005d40| 65 78 70 2d 66 6f 63 75 | 73 2d 41 20 65 64 69 66 |exp-focu|s-A edif|
|00005d50| 66 2d 76 69 73 69 62 6c | 65 2d 62 6f 75 6e 64 73 |f-visibl|e-bounds|
|00005d60| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 62 6f 75 6e | ediff-w|ide-boun|
|00005d70| 64 73 20 65 64 69 66 66 | 2d 68 61 73 2d 66 61 63 |ds ediff|-has-fac|
|00005d80| 65 2d 73 75 70 70 6f 72 | 74 2d 70 20 65 64 69 66 |e-suppor|t-p edif|
|00005d90| 66 2d 63 75 72 72 65 6e | 74 2d 64 69 66 66 2d 6f |f-curren|t-diff-o|
|00005da0| 76 65 72 6c 61 79 2d 41 | 20 6f 76 65 72 6c 61 79 |verlay-A| overlay|
|00005db0| 20 77 69 64 65 2d 76 69 | 73 69 62 69 6c 69 74 79 | wide-vi|sibility|
|00005dc0| 2d 70 20 66 6f 63 75 73 | 2d 72 65 67 65 78 70 20 |-p focus|-regexp |
|00005dd0| 68 69 64 65 2d 72 65 67 | 65 78 70 20 64 69 66 66 |hide-reg|exp diff|
|00005de0| 2d 76 65 63 20 76 61 6c | 75 65 73 20 62 75 66 20 |-vec val|ues buf |
|00005df0| 65 64 69 66 66 2d 33 77 | 61 79 2d 63 6f 6d 70 61 |ediff-3w|ay-compa|
|00005e00| 72 69 73 6f 6e 2d 6a 6f | 62 20 73 65 74 2d 77 69 |rison-jo|b set-wi|
|00005e10| 6e 64 6f 77 2d 62 75 66 | 66 65 72 20 65 64 69 66 |ndow-buf|fer edif|
|00005e20| 66 2d 62 75 66 66 65 72 | 2d 43 20 65 64 69 66 66 |f-buffer|-C ediff|
|00005e30| 2d 77 69 6e 64 6f 77 2d | 43 20 65 64 69 66 66 2d |-window-|C ediff-|
|00005e40| 62 75 66 66 65 72 2d 42 | 20 65 64 69 66 66 2d 62 |buffer-B| ediff-b|
|00005e50| 75 66 66 65 72 2d 76 61 | 6c 75 65 73 2d 6f 72 69 |uffer-va|lues-ori|
|00005e60| 67 2d 43 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |g-C edif|f-buffer|
|00005e70| 2d 76 61 6c 75 65 73 2d | 6f 72 69 67 2d 42 20 65 |-values-|orig-B e|
|00005e80| 64 69 66 66 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |diff-dif|ference-|
|00005e90| 76 65 63 74 6f 72 2d 43 | 20 65 64 69 66 66 2d 64 |vector-C| ediff-d|
|00005ea0| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00005eb0| 2d 42 20 65 64 69 66 66 | 2d 72 65 67 65 78 70 2d |-B ediff|-regexp-|
|00005ec0| 68 69 64 65 2d 43 20 65 | 64 69 66 66 2d 72 65 67 |hide-C e|diff-reg|
|00005ed0| 65 78 70 2d 68 69 64 65 | 2d 42 20 65 64 69 66 66 |exp-hide|-B ediff|
|00005ee0| 2d 72 65 67 65 78 70 2d | 66 6f 63 75 73 2d 43 20 |-regexp-|focus-C |
|00005ef0| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 66 6f 63 |ediff-re|gexp-foc|
|00005f00| 75 73 2d 42 20 65 64 69 | 66 66 2d 63 75 72 72 65 |us-B edi|ff-curre|
|00005f10| 6e 74 2d 64 69 66 66 2d | 6f 76 65 72 6c 61 79 2d |nt-diff-|overlay-|
|00005f20| 43 20 65 64 69 66 66 2d | 63 75 72 72 65 6e 74 2d |C ediff-|current-|
|00005f30| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 42 20 32 |diff-ove|rlay-B 2|
|00005f40| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 6a 6f 62 20 | ediff-3|way-job |
|00005f50| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 62 6f 75 |ediff-na|rrow-bou|
|00005f60| 6e 64 73 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |nds edif|f-contro|
|00005f70| 6c 2d 62 75 66 66 65 72 | 20 63 74 6c 2d 62 75 66 |l-buffer| ctl-buf|
|00005f80| 20 30 20 6e 20 65 64 69 | 66 66 2d 6e 75 6d 62 65 | 0 n edi|ff-numbe|
|00005f90| 72 2d 6f 66 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |r-of-dif|ferences|
|00005fa0| 20 65 64 69 66 66 2d 73 | 65 74 2d 73 74 61 74 65 | ediff-s|et-state|
|00005fb0| 2d 6f 66 2d 64 69 66 66 | 2d 69 6e 2d 61 6c 6c 2d |-of-diff|-in-all-|
|00005fc0| 62 75 66 66 65 72 73 20 | 65 64 69 66 66 2d 72 65 |buffers |ediff-re|
|00005fd0| 63 65 6e 74 65 72 20 6e | 6f 2d 72 65 68 69 67 68 |center n|o-rehigh|
|00005fe0| 6c 69 67 68 74 5d 20 38 | 20 28 23 24 20 2e 20 32 |light] 8| (#$ . 2|
|00005ff0| 33 31 31 39 29 20 6e 69 | 6c 5d 29 0a 23 40 39 33 |3119) ni|l]).#@93|
|00006000| 20 54 6f 67 67 6c 65 20 | 77 69 64 65 2f 72 65 67 | Toggle |wide/reg|
|00006010| 75 6c 61 72 20 64 69 73 | 70 6c 61 79 2e 0a 54 68 |ular dis|play..Th|
|00006020| 69 73 20 69 73 20 65 73 | 70 65 63 69 61 6c 6c 79 |is is es|pecially|
|00006030| 20 75 73 65 66 75 6c 20 | 77 68 65 6e 20 63 6f 6d | useful |when com|
|00006040| 70 61 72 69 6e 67 20 62 | 75 66 66 65 72 73 20 73 |paring b|uffers s|
|00006050| 69 64 65 2d 62 79 2d 73 | 69 64 65 2e 1f 0a 28 64 |ide-by-s|ide...(d|
|00006060| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 74 |efalias |'ediff-t|
|00006070| 6f 67 67 6c 65 2d 77 69 | 64 65 2d 64 69 73 70 6c |oggle-wi|de-displ|
|00006080| 61 79 20 23 5b 6e 69 6c | 20 22 c0 19 c2 09 21 ac |ay #[nil| "....!.|
|00006090| 85 c3 c4 0d 5c 22 88 29 | c6 20 ac 8c c3 c7 0e 08 |....\".)|. ......|
|000060a0| ab 83 c9 aa 81 ca 5c 22 | 88 cb cc 21 88 0e 0d 1e |......\"|...!....|
|000060b0| 0e 0e 0f 3f 89 16 0f ac | b9 0e 0e ab aa d0 0e 0e |...?....|........|
|000060c0| 21 ab a4 d1 d0 0e 0e 21 | 21 ab 9c 72 0e 0e 71 88 |!......!|!..r..q.|
|000060d0| d2 0e 13 0e 14 5c 22 88 | 0e 0e 71 88 c0 16 14 c0 |.....\".|..q.....|
|000060e0| 16 15 cb cc 21 29 aa b8 | 0d d6 61 ae b3 c3 0e 17 |....!)..|..a.....|
|000060f0| 21 aa ad 0e 18 20 88 0e | 0e ab 9c d0 0e 0e 21 ab |!.... ..|......!.|
|00006100| 96 d1 d0 0e 0e 21 21 ab | 8e 72 0e 0e 71 88 c0 16 |.....!!.|.r..q...|
|00006110| 15 cb cc 21 29 aa 89 0d | d6 61 ae 84 c3 0e 17 21 |...!)...|.a.....!|
|00006120| 29 87 22 20 5b 6e 69 6c | 20 6d 65 74 61 2d 62 75 |)." [nil| meta-bu|
|00006130| 66 2d 70 20 65 64 69 66 | 66 2d 69 6e 2d 63 6f 6e |f-p edif|f-in-con|
|00006140| 74 72 6f 6c 2d 62 75 66 | 66 65 72 2d 70 20 65 72 |trol-buf|fer-p er|
|00006150| 72 6f 72 20 22 25 53 3a | 20 54 68 69 73 20 63 6f |ror "%S:| This co|
|00006160| 6d 6d 61 6e 64 20 72 75 | 6e 73 20 69 6e 20 45 64 |mmand ru|ns in Ed|
|00006170| 69 66 66 20 43 6f 6e 74 | 72 6f 6c 20 42 75 66 66 |iff Cont|rol Buff|
|00006180| 65 72 20 6f 6e 6c 79 21 | 22 20 74 68 69 73 2d 63 |er only!|" this-c|
|00006190| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 77 69 6e |ommand e|diff-win|
|000061a0| 64 6f 77 2d 64 69 73 70 | 6c 61 79 2d 70 20 22 25 |dow-disp|lay-p "%|
|000061b0| 73 45 6d 61 63 73 20 69 | 73 20 6e 6f 74 20 72 75 |sEmacs i|s not ru|
|000061c0| 6e 6e 69 6e 67 20 61 73 | 20 61 20 77 69 6e 64 6f |nning as| a windo|
|000061d0| 77 20 61 70 70 6c 69 63 | 61 74 69 6f 6e 22 20 65 |w applic|ation" e|
|000061e0| 64 69 66 66 2d 65 6d 61 | 63 73 2d 70 20 22 22 20 |diff-ema|cs-p "" |
|000061f0| 22 58 22 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |"X" edif|f-recent|
|00006200| 65 72 20 6e 6f 2d 72 65 | 68 69 67 68 6c 69 67 68 |er no-re|highligh|
|00006210| 74 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |t ediff-|control-|
|00006220| 62 75 66 66 65 72 20 63 | 74 6c 2d 62 75 66 20 65 |buffer c|tl-buf e|
|00006230| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|00006240| 79 2d 70 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |y-p get-|buffer b|
|00006250| 75 66 66 65 72 2d 6e 61 | 6d 65 20 6d 6f 64 69 66 |uffer-na|me modif|
|00006260| 79 2d 66 72 61 6d 65 2d | 70 61 72 61 6d 65 74 65 |y-frame-|paramete|
|00006270| 72 73 20 65 64 69 66 66 | 2d 77 69 64 65 2d 64 69 |rs ediff|-wide-di|
|00006280| 73 70 6c 61 79 2d 66 72 | 61 6d 65 20 65 64 69 66 |splay-fr|ame edif|
|00006290| 66 2d 77 69 64 65 2d 64 | 69 73 70 6c 61 79 2d 6f |f-wide-d|isplay-o|
|000062a0| 72 69 67 2d 70 61 72 61 | 6d 65 74 65 72 73 20 65 |rig-para|meters e|
|000062b0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 42 20 65 64 |diff-win|dow-B ed|
|000062c0| 69 66 66 2d 71 75 69 74 | 20 65 64 69 66 66 2d 4b |iff-quit| ediff-K|
|000062d0| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|000062e0| 45 52 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 77 69 |ER ediff|-make-wi|
|000062f0| 64 65 2d 64 69 73 70 6c | 61 79 2d 66 75 6e 63 74 |de-displ|ay-funct|
|00006300| 69 6f 6e 5d 20 34 20 28 | 23 24 20 2e 20 32 34 35 |ion] 4 (|#$ . 245|
|00006310| 37 37 29 20 6e 69 6c 5d | 29 0a 23 40 31 34 38 20 |77) nil]|).#@148 |
|00006320| 53 77 69 74 63 68 20 66 | 72 6f 6d 20 6d 75 6c 74 |Switch f|rom mult|
|00006330| 69 66 72 61 6d 65 20 64 | 69 73 70 6c 61 79 20 74 |iframe d|isplay t|
|00006340| 6f 20 73 69 6e 67 6c 65 | 2d 66 72 61 6d 65 20 64 |o single|-frame d|
|00006350| 69 73 70 6c 61 79 20 61 | 6e 64 20 62 61 63 6b 2e |isplay a|nd back.|
|00006360| 0a 54 6f 20 63 68 61 6e | 67 65 20 74 68 65 20 64 |.To chan|ge the d|
|00006370| 65 66 61 75 6c 74 2c 20 | 73 65 74 20 74 68 65 20 |efault, |set the |
|00006380| 76 61 72 69 61 62 6c 65 | 20 60 65 64 69 66 66 2d |variable| `ediff-|
|00006390| 77 69 6e 64 6f 77 2d 73 | 65 74 75 70 2d 66 75 6e |window-s|etup-fun|
|000063a0| 63 74 69 6f 6e 27 2c 0a | 77 68 69 63 68 20 73 65 |ction',.|which se|
|000063b0| 65 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |e...(def|alias 'e|
|000063c0| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 6d 75 6c 74 |diff-tog|gle-mult|
|000063d0| 69 66 72 61 6d 65 20 23 | 5b 6e 69 6c 20 22 c0 19 |iframe #|[nil "..|
|000063e0| c2 20 ac 8b c3 c4 0d ab | 83 c6 aa 81 c7 5c 22 88 |. ......|.....\".|
|000063f0| 0e 08 c9 61 ab 84 ca 11 | aa 8f 0e 08 ca 61 ab 89 |...a....|.....a..|
+--------+-------------------------+-------------------------+--------+--------+